separate job

RblSb · Feb 10, 2024 · 2f372ba · 2f372ba
1 parent 47287c6
commit 2f372ba
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 28 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -551,7 +551,7 @@ jobs:
         if: matrix.os == 'macos-latest'
         uses: actions/upload-artifact@v3
         with:
-          name: macBinaries
+          name: macX64Binaries
           path: out
 
       - name: Upload artifact (arm)
@@ -658,9 +658,43 @@ jobs:
         working-directory: ${{github.workspace}}/tests
 
 
-  mac-test:
+  mac-build-universal:
     needs: mac-build
     runs-on: macos-latest
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@main
+      - uses: actions/download-artifact@v3
+        with:
+          name: macX64Binaries
+          path: macX64Binaries
+      - uses: actions/download-artifact@v3
+        with:
+          name: macArmBinaries
+          path: macArmBinaries
+
+      - name: Make universal binary
+        run: |
+          set -ex
+          tar -xf macX64Binaries/*_bin.tar.gz -C macX64Binaries --strip-components=1
+          tar -xf macArmBinaries/*_bin.tar.gz -C macArmBinaries --strip-components=1
+          lipo -create -output haxe macX64Binaries/haxe macArmBinaries/haxe
+          # there is only x64 haxelib
+          mv macX64Binaries/haxelib .
+          make -s package_unix package_installer_mac
+          ls -l out
+          otool -L ./haxe
+          otool -L ./haxelib
+
+      - name: Upload artifact (universal)
+        uses: actions/upload-artifact@v3
+        with:
+          name: macBinaries
+          path: out
+
+  mac-test:
+    needs: mac-build-universal
+    runs-on: macos-latest
     env:
       PLATFORM: mac
       TEST: ${{matrix.target}}
@@ -681,10 +715,6 @@ jobs:
         with:
           name: macBinaries
           path: macBinaries
-      - uses: actions/download-artifact@v3
-        with:
-          name: macArmBinaries
-          path: macArmBinaries
 
       - name: Install Neko from S3
         run: |
@@ -703,14 +733,6 @@ 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/build-mac.yml b/extra/github-actions/build-mac.yml
@@ -59,7 +59,7 @@
   if: matrix.os == 'macos-latest'
   uses: actions/upload-artifact@v3
   with:
-    name: macBinaries
+    name: macX64Binaries
     path: out
 
 - name: Upload artifact (arm)

diff --git a/extra/github-actions/test-mac.yml b/extra/github-actions/test-mac.yml
@@ -1,11 +1,3 @@
-- 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
@@ -362,9 +362,43 @@ jobs:
       @import install-neko-windows.yml
       @import test-windows.yml
 
-  mac-test:
+  mac-build-universal:
     needs: mac-build
     runs-on: macos-latest
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@main
+      - uses: actions/download-artifact@v3
+        with:
+          name: macX64Binaries
+          path: macX64Binaries
+      - uses: actions/download-artifact@v3
+        with:
+          name: macArmBinaries
+          path: macArmBinaries
+
+      - name: Make universal binary
+        run: |
+          set -ex
+          tar -xf macX64Binaries/*_bin.tar.gz -C macX64Binaries --strip-components=1
+          tar -xf macArmBinaries/*_bin.tar.gz -C macArmBinaries --strip-components=1
+          lipo -create -output haxe macX64Binaries/haxe macArmBinaries/haxe
+          # there is only x64 haxelib
+          mv macX64Binaries/haxelib .
+          make -s package_unix package_installer_mac
+          ls -l out
+          otool -L ./haxe
+          otool -L ./haxelib
+
+      - name: Upload artifact (universal)
+        uses: actions/upload-artifact@v3
+        with:
+          name: macBinaries
+          path: out
+
+  mac-test:
+    needs: mac-build-universal
+    runs-on: macos-latest
     env:
       PLATFORM: mac
       TEST: ${{matrix.target}}
@@ -385,10 +419,6 @@ 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