lmi-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[lmi-commits] [lmi] master deabd16 08/14: Add native Linux build variant


From: Greg Chicares
Subject: [lmi-commits] [lmi] master deabd16 08/14: Add native Linux build variant to GitHub CI workflows
Date: Sat, 10 Oct 2020 11:07:12 -0400 (EDT)

branch: master
commit deabd161870e8e60d843bc188f79b13eb9d6d035
Author: Ilya Sinitsyn <isinitsyn@tt-solutions.com>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Add native Linux build variant to GitHub CI workflows
---
 .github/workflows/ci.yml | 46 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2c50ccf..f0522e0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,10 +12,19 @@ on:
 jobs:
   build-msw32-cross:
     runs-on: ubuntu-20.04
-    name: Cross-compile for MSW-32
+    name: ${{ matrix.name }}
+    strategy:
+      matrix:
+        include:
+          - name: Cross-compile for MSW-32
+            triplet: i686-w64-mingw32
+            mingw: true
+          - name: Native Linux build
+            triplet: x86_64-pc-linux-gnu
+            mingw: false
     env:
       LMI_COMPILER: gcc
-      LMI_TRIPLET: i686-w64-mingw32
+      LMI_TRIPLET: ${{ matrix.triplet }}
 
     steps:
       - name: Checkout
@@ -30,9 +39,18 @@ jobs:
           sudo apt-get dist-upgrade -o APT::Immediate-Configure=0 # Avoid 
configuration error later
           sudo apt-get --assume-yes install \
             automake bc bsdmainutils bzip2 curl cvs default-jre \
-            g++-mingw-w64-i686 g++-multilib git jing libarchive-tools \
+            g++-multilib git jing libarchive-tools \
             libtool libxml2-utils libxslt1-dev make patch pkg-config rsync \
-            shellcheck sudo trang unzip wget wine32 xsltproc
+            shellcheck sudo trang unzip wget xsltproc
+
+          if ${{ matrix.mingw }}
+          then
+            sudo apt-get --assume-yes install \
+              g++-mingw-w64-i686 wine32
+          else
+            sudo apt-get --assume-yes install \
+              libgtk-3-dev
+          fi
 
       - name: Fix up libtool
         run: sudo sed -i'' -e 's/^int _putenv/_CRTIMP int _putenv/' 
/usr/share/libtool/build-aux/ltmain.sh
@@ -41,7 +59,13 @@ jobs:
         run: |
           echo "NORMAL_UID=`id --user`" >> $GITHUB_ENV
           echo "coefficiency=--jobs=`nproc`" >> $GITHUB_ENV
-          gcc_version=$(${LMI_TRIPLET}-${LMI_COMPILER} -dumpversion|tr -d '\r')
+          if ${{ matrix.mingw }}
+          then
+            compiler=${LMI_TRIPLET}-${LMI_COMPILER}
+          else
+            compiler=${LMI_COMPILER}
+          fi
+          gcc_version=$($compiler -dumpversion|tr -d '\r')
           echo "gcc_version=$gcc_version" >> $GITHUB_ENV
 
           echo "xml2_sha1=$(git rev-parse HEAD:third_party/libxml2)" >> 
$GITHUB_ENV
@@ -110,10 +134,10 @@ jobs:
             <custom_input_1_filename>custom.inix</custom_input_1_filename>
             <custom_output_0_filename>custom.out0</custom_output_0_filename>
             <custom_output_1_filename>custom.out1</custom_output_1_filename>
-            
<default_input_filename>C:/etc/opt/lmi/default.ill</default_input_filename>
+            
<default_input_filename>/etc/opt/lmi/default.ill</default_input_filename>
             <libraries_to_preload/>
             <offer_hobsons_choice>0</offer_hobsons_choice>
-            <print_directory>C:/opt/lmi/print</print_directory>
+            <print_directory>/opt/lmi/print</print_directory>
             
<seconds_to_pause_between_printouts>10</seconds_to_pause_between_printouts>
             <skin_filename>skin.xrc</skin_filename>
             <spreadsheet_file_extension>.tsv</spreadsheet_file_extension>
@@ -131,4 +155,10 @@ jobs:
         run: make cli_tests
 
       - name: Run unit tests
-        run: make unit_tests
+        run: |
+          if [ !${{ matrix.mingw }} ]
+          then
+            # Currently failing tests.
+            exclude_args="excluded_unit_test_targets=path_utility_test"
+          fi
+          make unit_tests $exclude_args



reply via email to

[Prev in Thread] Current Thread [Next in Thread]