fix(ci): fix linux builds

Dich0tomy · Mar 1, 2024 · 000db33 · 000db33
1 parent f307ada
commit 000db33
Showing 1 changed file with 21 additions and 15 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
         run: nix flake check .# -L --extra-experimental-features nix-command --extra-experimental-features flakes
 
   linux:
-    name: ${{ matrix.build.runner }} ${{ matrix.build.cc }}
+    name: ${{ matrix.build.runner }} ${{ matrix.build.buildsystem }} ${{ matrix.build.cc }}
     timeout-minutes: 10
     strategy:
       fail-fast: false
@@ -37,33 +37,39 @@ jobs:
       - if: ${{ matrix.build.buildsystem == 'meson' && matrix.build.cc == 'clang' }}
         name: ${{ matrix.build.buildsystem }} ${{ matrix.build.cc }} 
         run: |
-          nix develop .#ciClang -L --extra-experimental-features nix-command --extra-experimental-features flakes
-          just -f ./ci/Justfile build-and-test-linux
+          nix develop .#ciClang \
+            -L \
+            --extra-experimental-features nix-command \
+            --extra-experimental-features flakes \
+            -c sh 
+            -c "just -f ./ci/Justfile build-and-test-linux"
       - if: ${{ matrix.build.buildsystem == 'meson' && matrix.build.cc == 'gcc' }}
         name: ${{ matrix.build.buildsystem }} ${{ matrix.build.cc }} 
         run: |
-          nix develop .#ciGcc -L --extra-experimental-features nix-command --extra-experimental-features flakes
-          just -f ./ci/Justfile build-and-test-linux
+          nix develop .#ciGcc \
+            -L \
+            --extra-experimental-features nix-command \
+            --extra-experimental-features flakes \
+            -c sh 
+            -c "just -f ./ci/Justfile build-and-test-linux"
       - if: ${{ matrix.build.buildsystem == 'cmake' && matrix.build.cc == 'clang' }}
         name: ${{ matrix.build.buildsystem }} ${{ matrix.build.cc }} 
         run: |
           nix develop .#ciGcc \
             -L \
-            --extra-experimental-features \
-            nix-command \
-            --extra-experimental-features \
-            flakes
-          cmake -S . -B build -D CMAKE_BUILD_TYPE='Debug' && cmake --build build --parallel 16 && ./build/src/test/dire_test
+            --extra-experimental-features nix-command \
+            --extra-experimental-features flakes \
+            -c sh 
+            -c "cmake -S . -B build -D CMAKE_BUILD_TYPE='Debug' && cmake --build build --parallel 16 && ./build/src/test/dire_test"
       - if: ${{ matrix.build.buildsystem == 'cmake' && matrix.build.cc == 'gcc' }}
         name: ${{ matrix.build.buildsystem }} ${{ matrix.build.cc }} 
         run: |
           nix develop .#ciClang \
             -L \
-            --extra-experimental-features \
-            nix-command \
-            --extra-experimental-features \
-            flakes
-          cmake -S . -B build -D CMAKE_BUILD_TYPE='Debug' && cmake --build build --parallel 16 && ./build/src/test/dire_test
+            --extra-experimental-features nix-command \
+            --extra-experimental-features flakes \
+            -c sh
+            -c "cmake -S . -B build -D CMAKE_BUILD_TYPE='Debug' && cmake --build build --parallel 16 && ./build/src/test/dire_test"
 
   darwin:
     name: ${{ matrix.build.runner }}