See if mac builds again with etjump CI fixes

Author: ensiform

.github/workflows/build.yml

@@ -47,7 +47,7 @@ jobs:
         fetch-depth: 0
 
     - name: Configure CMake
-      run: cmake -B ${{ github.workspace }}/build -DCMAKE_BUILD_TYPE=${{ matrix.config }} -G "Visual Studio 17 2022" -A ${{ matrix.platform }}
+      run: cmake -B ${{ github.workspace }}/build -DCMAKE_BUILD_TYPE=${{ matrix.config }} -G "Visual Studio 18 2026" -A ${{ matrix.platform }}
 
     - name: Build
       run: cmake --build ${{ github.workspace }}/build --config ${{ matrix.config }} --parallel
@@ -95,39 +95,75 @@ jobs:
         name: etf-artifacts-linux-${{ matrix.arch }}
         path: ${{ github.workspace }}/build/etf
 
-  #macOS:
-  #  name: macOS ${{ matrix.arch }}
-  #  runs-on: macos-14
-  #  strategy:
-  #    fail-fast: false
-  #    matrix:
-  #      arch: [x64]
-  #      config: [Release]
-  #      include:
-  #        - arch: x64
-  #          platforms: "\"x86_64;arm64\""
-  #          osx-target: "10.12"
-  #
-  #  steps:
-  #  - uses: actions/checkout@v4
-  #    with:
-  #      fetch-depth: 0
-  #
-  #  - name: Configure CMake
-  #    run: cmake -B ${{ github.workspace }}/build -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DCMAKE_OSX_ARCHITECTURES=${{ matrix.platforms }} -DCMAKE_OSX_DEPLOYMENT_TARGET=${{ matrix.osx-target }}
-  #
-  #  - name: Build
-  #    run: cmake --build ${{ github.workspace }}/build --config ${{ matrix.config }} --parallel
-  #
-  #  #- name: Upload artifacts
-  #  #  uses: actions/upload-artifact@v4
-  #  #  with:
-  #  #    name: etf-artifacts-macos-${{ matrix.arch }}
-  #  #    path: ${{ github.workspace }}/build/etf
+  macOS:
+    name: macOS ${{ matrix.arch }}
+    runs-on: macos-14
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [x86_64, arm64]
+        config: [Release]
+        include:
+          - osx-target: "10.13"
+  
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+  
+    - name: Configure CMake
+      run: cmake -B ${{ github.workspace }}/build -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DCMAKE_OSX_ARCHITECTURES=${{ matrix.platforms }} -DCMAKE_OSX_DEPLOYMENT_TARGET=${{ matrix.osx-target }}
+  
+    - name: Build
+      run: cmake --build ${{ github.workspace }}/build --config ${{ matrix.config }} --parallel
+  
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: etf-artifacts-macos-${{ matrix.arch }}
+        path: ${{ github.workspace }}/build/etf
+
+  macOS-universal:
+    name: macOS Universal Binaries
+    runs-on: macos-14
+    needs: [macOS]
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          pattern: etf-artifacts-macos-*
+          path: artifacts
+
+      - name: Create universal binaries
+        run: |
+          mkdir -p build-universal
+          cp -R artifacts/etf-artifacts-macos-arm64/* build-universal
+          lipo -create artifacts/etf-artifacts-macos-x86_64/cgame_mac \
+                       artifacts/etf-artifacts-macos-arm64/cgame_mac \
+                -output build-universal/cgame_mac
+          lipo -create artifacts/etf-artifacts-macos-x86_64/ui_mac \
+                       artifacts/etf-artifacts-macos-arm64/ui_mac \
+                -output build-universal/ui_mac
+          lipo -create artifacts/etf-artifacts-macos-x86_64/qagame_mac \
+                       artifacts/etf-artifacts-macos-arm64/qagame_mac \
+                -output build-universal/qagame_mac
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: etf-artifacts-macos-universal
+          path: ${{ github.workspace }}/build-universal
+
+      # cleanup the individual builds so package doesn't download them
+      - name: Cleanup
+        uses: geekyeggo/delete-artifact@v5
+        with:
+          name: |
+            etf-artifacts-macos-arm64
+            etf-artifacts-macos-x86_64
         
   package:
     if: github.ref == 'refs/heads/master' && github.event_name == 'push' || github.event_name == 'workflow_dispatch'
-    needs: [Windows-MSVC, Linux] #, macOS]
+    needs: [Windows-MSVC, Linux, macOS-universal]
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4