CI: Recombine winlayer build into Windows matrix

NBlood · Aug 3, 2023 · 528bf67 · 528bf67
1 parent 750d846
commit 528bf67
Showing 1 changed file with 14 additions and 35 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,12 +16,16 @@ jobs:
           - name: x86_64 GCC
             sys: mingw64
             env: x86_64
-            label: win64
+            publish-as: win64
           - name: i686 GCC
             sys: mingw32
             env: i686
             pkg: nasm
-            label: win32
+            publish-as: win32
+          - name: x86_64 GCC without SDL
+            sys: mingw64
+            env: x86_64
+            opt: RENDERTYPE=WIN
     name: Windows MSYS2 ${{matrix.name}}
     runs-on: windows-latest
     defaults:
@@ -37,13 +41,15 @@ jobs:
         cache: true
         install: git mingw-w64-${{matrix.env}}-toolchain make ${{matrix.pkg}}
 
+    - name: fetch full history
+      if: github.ref == 'refs/heads/master' && matrix.publish-as != ''
+      run: git fetch --unshallow
+
     - name: build
-      run: |
-        git fetch --unshallow
-        make -j2 duke3d sw blood rr exhumed kenbuild tools SDLCONFIG= ${{matrix.opt}}
+      run: make -j2 duke3d sw blood rr exhumed kenbuild tools SDLCONFIG= ${{matrix.opt}}
 
     - name: prepare artifacts
-      if: github.ref == 'refs/heads/master'
+      if: github.ref == 'refs/heads/master' && matrix.publish-as != ''
       run: |
         mkdir -p upload/nblood/
         mkdir -p upload/rednukem/
@@ -53,39 +59,12 @@ jobs:
         cp pcexhumed.exe upload/pcexhumed/
 
     - uses: actions/upload-artifact@v2
-      if: github.ref == 'refs/heads/master'
+      if: github.ref == 'refs/heads/master' && matrix.publish-as != ''
       with:
-        name: ${{matrix.label}}
+        name: ${{matrix.publish-as}}
         path: upload/
         if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
 
-  build-windows-msys2-testonly:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - name: x86_64 GCC without SDL
-            sys: mingw64
-            env: x86_64
-            opt: RENDERTYPE=WIN
-    name: Windows MSYS2 ${{matrix.name}}
-    runs-on: windows-latest
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-    - uses: actions/checkout@v3
-
-    - uses: msys2/setup-msys2@v2
-      with:
-        msystem: ${{matrix.sys}}
-        update: true
-        cache: true
-        install: git mingw-w64-${{matrix.env}}-toolchain make ${{matrix.pkg}}
-
-    - name: build
-      run: make -j2 duke3d sw blood rr exhumed kenbuild tools SDLCONFIG= ${{matrix.opt}}
-
   build-linux:
     strategy:
       fail-fast: false