Update build.yml

Velaron · Oct 28, 2023 · 8d40116 · 8d40116
1 parent dd61f45
commit 8d40116
Showing 1 changed file with 10 additions and 23 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -80,6 +80,10 @@ jobs:
   linux:
     name: Linux
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        arch: ['i386', 'amd64']
+      fail-fast: false
     steps:
       - name: Checkout sources
         uses: actions/checkout@v3
@@ -93,9 +97,11 @@ jobs:
           sudo apt-get install libatomic1:i386 libgcc-s1:i386 libstdc++6:i386 gcc-multilib g++-multilib cmake ninja-build libfontconfig-dev:i386 libfontconfig-dev
       - name: Configure project
         run: |
-          export CC="gcc -m32"
-          export CXX="g++ -m32"
-          cmake --preset "linux-release-i386"
+          if [[ ${{ matrix.arch }} == i386 ]]; then
+            export CC="gcc -m32"
+            export CXX="g++ -m32"
+          fi
+          cmake --preset "linux-release-${{ matrix.arch }}"
       - name: Build
         run: cmake --build .
         working-directory: build
@@ -104,31 +110,12 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: linux-i386
+          name: linux-${{ matrix.arch }}
           path: |
             build/3rdparty/ReGameDLL_CS/regamedll/cs.so
             build/3rdparty/mainui_cpp/menu.so
             build/cl_dll/client.so
             build/extras.pk3
-      - name: Clean up
-        run: rm -rf *
-        working-directory: build
-      - name: Configure project (x64)
-        run: cmake --preset "linux-release-amd64"
-      - name: Build (x64)
-        run: cmake --build .
-        working-directory: build
-      - name: Generate extras.pk3
-        run: zip -0 -r build/extras.pk3 3rdparty/cs16client-extras
-      - name: Upload artifacts (x64)
-        uses: actions/upload-artifact@v3
-        with:
-          name: linux-amd64
-          path: |
-            build/3rdparty/ReGameDLL_CS/regamedll/cs_amd64.so
-            build/3rdparty/mainui_cpp/menu_amd64.so
-            build/cl_dll/client_amd64.so
-            build/extras.pk3
   release:
     name: Release
     runs-on: ubuntu-latest