Abi in MacOS artifacts

COVESA · Sep 11, 2024 · fcfa9b8 · fcfa9b8
1 parent 2b29fdd
commit fcfa9b8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/.github/workflows/BuildPR.yml b/.github/workflows/BuildPR.yml
@@ -14,9 +14,11 @@ jobs:
       fail-fast: false
       matrix:
         macos: [ macos-13 ]
+        abi: [ x86 ]
         xcode: [ Xcode_15.2 ]
         include:
           - macos: macos-14
+            abi: arm64
             xcode: Xcode
     steps:
       - name: Checkout
@@ -41,7 +43,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ success() }}
         with:
-          name: DLTViewer-${{ matrix.macos }}-x86_64
+          name: DLTViewer-${{ matrix.macos }}-${{ matrix.abi }}
           path: build/dist/DLTViewer*.tgz
 
   buildLinux:

diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -9,10 +9,16 @@ on:
 jobs:
   buildMac:
     name: Build macOS
-    runs-on: macos-13
+    runs-on: ${{ matrix.macos }}
     strategy:
       matrix:
         xcode: [ Xcode_15.2 ]
+        abi: [ x86 ]
+        macos: [ macos-13 ]
+        include:
+          - macos: macos-14
+            abi: arm64
+            xcode: Xcode
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -30,12 +36,12 @@ jobs:
       - name: Build project
         run: scripts/darwin/build.sh
       - name: Archive artifact
-        run: zip DLT-macOS.zip -r build/dist
+        run: zip DLT-macOS-${{ matrix.abi }}.zip -r build/dist
       - name: Upload DLT artifact
         uses: actions/upload-artifact@v4
         with:
-          name: DLT-Mac
-          path: DLT-macOS.zip
+          name: DLT-Mac-${{ matrix.abi }}
+          path: DLT-macOS-${{ matrix.abi }}.zip
 
   buildLinux:
     name: Build ${{ matrix.ubuntu }}
@@ -115,7 +121,9 @@ jobs:
       - name: Download DLT macOS artifacts
         uses: actions/download-artifact@v4
         with:
-          name: DLT-Mac
+          name: |
+            DLT-Mac-x86
+            DLT-Mac-arm64
       - name: Download DLT Windows parser artifacts
         uses: actions/download-artifact@v4
         with: