Build universal binary before testing

RblSb · Feb 10, 2024 · 47287c6 · 47287c6
1 parent 08b31b8
commit 47287c6
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -471,7 +471,7 @@ jobs:
         uses: actions/[email protected]
         with:
           path: ~/.opam/
-          key: ${{ runner.os }}-${{ hashFiles('./haxe.opam', './libs/') }}
+          key: ${{ matrix.os }}-${{ hashFiles('./haxe.opam', './libs/') }}
 
       - name: Install Neko from S3
         run: |
@@ -681,6 +681,10 @@ jobs:
         with:
           name: macBinaries
           path: macBinaries
+      - uses: actions/download-artifact@v3
+        with:
+          name: macArmBinaries
+          path: macArmBinaries
 
       - name: Install Neko from S3
         run: |
@@ -699,6 +703,14 @@ jobs:
       - name: Print Neko version
         run: neko -version 2>&1
 
+      - name: Make universal binary
+        run: |
+          set -ex
+          tar -xf macBinaries/*_bin.tar.gz -C macBinaries --strip-components=1
+          tar -xf macArmBinaries/*_bin.tar.gz -C macArmBinaries --strip-components=1
+          # mkdir ./macUniversalBinaries
+          lipo -create -output macBinaries/haxe macBinaries/haxe macArmBinaries/haxe
+
       - name: Setup Haxe
         run: |
           # mkdir ./macBinaries

diff --git a/extra/github-actions/test-mac.yml b/extra/github-actions/test-mac.yml
@@ -1,3 +1,11 @@
+- name: Make universal binary
+  run: |
+    set -ex
+    tar -xf macBinaries/*_bin.tar.gz -C macBinaries --strip-components=1
+    tar -xf macArmBinaries/*_bin.tar.gz -C macArmBinaries --strip-components=1
+    # mkdir ./macUniversalBinaries
+    lipo -create -output macBinaries/haxe macBinaries/haxe macArmBinaries/haxe
+
 - name: Setup Haxe
   run: |
     # mkdir ./macBinaries

diff --git a/extra/github-actions/workflows/main.yml b/extra/github-actions/workflows/main.yml
@@ -331,7 +331,7 @@ jobs:
         uses: actions/[email protected]
         with:
           path: ~/.opam/
-          key: ${{ runner.os }}-${{ hashFiles('./haxe.opam', './libs/') }}
+          key: ${{ matrix.os }}-${{ hashFiles('./haxe.opam', './libs/') }}
 
       @import install-neko-unix.yml
       @import build-mac.yml
@@ -385,6 +385,10 @@ jobs:
         with:
           name: macBinaries
           path: macBinaries
+      - uses: actions/download-artifact@v3
+        with:
+          name: macArmBinaries
+          path: macArmBinaries
 
       @import install-neko-unix.yml
       @import test-mac.yml