fixed macOS CI

Author: JeanPhilippeKernel

.github/workflows/job-cmakebuild-macOS-x64.yml

@@ -1,18 +1,21 @@
-# CMake build of ZEngine for macOS arm64
+# CMake build of ZEngine for macOS
 #
-name: ZEngine macOS arm64 Workflow
+name: ZEngine macOS Workflow
 
 on:
   workflow_call:
     inputs:
       configuration:
         type: string
         default: 'Debug'
+      architecture:
+        type: string
+        default: 'x64'
 
 jobs:
   cmake-build:
-    name: cmake-build-macOS-arm64-${{ inputs.configuration }}
-    runs-on: macos-latest
+    name: cmake-build-macOS-${{ inputs.architecture }}-${{ inputs.configuration }}
+    runs-on: ${{ inputs.architecture == 'x64' && 'macos-13' || 'macos-latest' }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -24,9 +27,9 @@ jobs:
       - name: Publish Build Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: Build-macOS-arm64-${{inputs.configuration}}
+          name: Build-macOS-${{ inputs.architecture }}-${{inputs.configuration}}
           path: |
-            Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/osx-arm64/publish/
+            Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/osx-${{ inputs.architecture }}/publish/
             Result.Darwin.x64.${{inputs.configuration}}/ZEngine/tests/${{inputs.configuration}}/
             !Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.resources.dll
             !Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll

.github/workflows/job-cmakebuild-macOS-arm64.yml renamed to .github/workflows/job-cmakebuild-macOS.yml

@@ -15,7 +15,7 @@ on:
 jobs:
   deploy:
     name: deploy-macOS-${{ inputs.architecture }}-${{ inputs.configuration }}
-    runs-on: ${{ matrix.architecture == 'x64' && 'macos-13' || 'macos-latest' }}
+    runs-on: ${{ inputs.architecture == 'x64' && 'macos-13' || 'macos-latest' }}
     steps:
       - uses: actions/download-artifact@v4
         with:

.github/workflows/job-deploy-macOS.yml

@@ -1,25 +1,28 @@
-# Run tests for macOS arm64
+# Run tests for macOS
 #
-name: macOS arm64 Test Workflow
+name: macOS Test Workflow
 
 on:
   workflow_call:
     inputs:
       configuration:
         type: string
         default: 'Debug'
+      architecture:
+        type: string
+        default: 'x64'
 
 jobs:
   test:
-    name: test-macOS-arm64-${{ inputs.configuration }}
-    runs-on: macos-latest
+    name: test-macOS-${{ inputs.architecture }}-${{ inputs.configuration }}
+    runs-on: ${{ inputs.architecture == 'x64' && 'macos-13' || 'macos-latest' }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
 
       - uses: actions/download-artifact@v4
         with:
-          name: Build-macOS-arm64-${{ inputs.configuration }}
+          name: Build-macOS-${{ inputs.architecture }}-${{ inputs.configuration }}
           path: Result.Darwin.x64.${{ inputs.configuration }}
 
       - name: Run Tests

.github/workflows/job-test-macOS-x64.yml

@@ -8,19 +8,21 @@ jobs:
       matrix:
         buildConfiguration: [Debug, Release]
         architecture: [x64, arm64]
-    uses: ./.github/workflows/job-cmakebuild-macOS-${{ matrix.architecture }}.yml
+    uses: ./.github/workflows/job-cmakebuild-macOS.yml
     with:
       configuration: ${{matrix.buildConfiguration}}
+      architecture: ${{ matrix.architecture }}
 
   test:
     needs: cmake-build
     strategy:
       matrix:
         testConfiguration: [Debug, Release]
         architecture: [x64, arm64]
-    uses: ./.github/workflows/job-test-macOS-${{ matrix.architecture }}.yml
+    uses: ./.github/workflows/job-test-macOS.yml
     with:
       configuration: ${{matrix.testConfiguration}}
+      architecture: ${{ matrix.architecture }}
 
   deploy:
     needs: test