[lmi-commits] [lmi] master f0e9ca79 2/5: Split "SO test" builds in their own jobs

[Vadim Zeitlin]

branch: master
commit f0e9ca79ade33b5039bacae19857b1ca49a7a135
Author: Vadim Zeitlin <vadim@tt-solutions.com>
Commit: Vadim Zeitlin <vadim@tt-solutions.com>

    Split "SO test" builds in their own jobs
    
    Instead of building both the normal and test build with SO attributes as
    part of the same job, split them into different ones to allow building
    them in parallel.
---
 .github/workflows/ci.yml | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9e6be5c4..a6098a6a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,7 +31,14 @@ jobs:
           - name: MSW/make/mingw64
             triplet: x86_64-w64-mingw32
             mingw: true
+            gui_test: true
+          - name: MSW/make/mingw64 (so_test)
+            triplet: x86_64-w64-mingw32
+            build_type: so_test
+            mingw: true
           - name: Linux/make/gcc
+          - name: Linux/make/gcc (so_test)
+            build_type: so_test
           - name: Linux/autotools/gcc
             autotools: true
           - name: Linux/autotools/clang
@@ -282,13 +289,12 @@ jobs:
           if [ ${{ matrix.autotools }} ]; then
             make --keep-going V=1 $coefficiency -C ${lmi_build_dir}
           else
-            make $coefficiency --output-sync=recurse
+            if [ -n "${{ matrix.build_type }}" ]; then
+              build_type_arg=build_type=${{ matrix.build_type }}
+            fi
+            make $coefficiency --output-sync=recurse $build_type_arg
           fi
 
-      - name: Build lmi with SO attributes
-        if: matrix.autotools != true
-        run: make $coefficiency --output-sync=recurse build_type=so_test all
-
       - name: Setup lmi for tests
         run: |
           ./bland_configurable_settings.sh /opt/lmi/data
@@ -354,7 +360,7 @@ jobs:
           fi
 
       - name: Launch Xvfb
-        if: matrix.mingw
+        if: matrix.gui_test
         run: |
             sudo mkdir /tmp/.X11-unix
             sudo chmod 1777 /tmp/.X11-unix
@@ -382,7 +388,7 @@ jobs:
             echo 'DISPLAY=:10' >> "$GITHUB_ENV"
 
       - name: Run GUI tests
-        if: matrix.mingw
+        if: matrix.gui_test
         run: |
             . ./set_toolchain.sh
             $PERFORM /opt/lmi/bin/wx_test"$EXEEXT" --ash_nazg 
--data_path=/opt/lmi/data