start messing

RblSb · Feb 9, 2024 · c3ba518 · c3ba518
1 parent c7ac543
commit c3ba518
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -445,7 +445,11 @@ jobs:
           path: out/linux/arm64
 
   mac-build:
-    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-latest, macos-14]
+    runs-on: ${{ matrix.os }}
     env:
       PLATFORM: mac
       OPAMYES: 1
@@ -494,7 +498,7 @@ jobs:
           curl -L https://github.com/madler/zlib/releases/download/v$ZLIB_VERSION/zlib-$ZLIB_VERSION.tar.gz | tar xz
           cd zlib-$ZLIB_VERSION
           ./configure
-          make && make install
+          sudo make && sudo make install
           cd ..
           curl -L https://github.com/ARMmbed/mbedtls/archive/v$MBEDTLS_VERSION.tar.gz | tar xz
           cd mbedtls-$MBEDTLS_VERSION
@@ -536,12 +540,20 @@ jobs:
           otool -L ./haxe
           otool -L ./haxelib
 
-      - name: Upload artifact
+      - name: Upload artifact (x64)
+        if: matrix.os == 'macos-latest'
         uses: actions/upload-artifact@v3
         with:
           name: macBinaries
           path: out
 
+      - name: Upload artifact (arm)
+        if: matrix.os == 'macos-14'
+        uses: actions/upload-artifact@v3
+        with:
+          name: macArmBinaries
+          path: out
+
 
   windows64-test:
     needs: windows64-build

diff --git a/extra/github-actions/build-mac.yml b/extra/github-actions/build-mac.yml
@@ -13,7 +13,7 @@
     curl -L https://github.com/madler/zlib/releases/download/v$ZLIB_VERSION/zlib-$ZLIB_VERSION.tar.gz | tar xz
     cd zlib-$ZLIB_VERSION
     ./configure
-    make && make install
+    sudo make && sudo make install
     cd ..
     curl -L https://github.com/ARMmbed/mbedtls/archive/v$MBEDTLS_VERSION.tar.gz | tar xz
     cd mbedtls-$MBEDTLS_VERSION
@@ -55,8 +55,16 @@
     otool -L ./haxe
     otool -L ./haxelib
 
-- name: Upload artifact
+- name: Upload artifact (x64)
+  if: matrix.os == 'macos-latest'
   uses: actions/upload-artifact@v3
   with:
     name: macBinaries
     path: out
+
+- name: Upload artifact (arm)
+  if: matrix.os == 'macos-14'
+  uses: actions/upload-artifact@v3
+  with:
+    name: macArmBinaries
+    path: out
diff --git a/extra/github-actions/workflows/main.yml b/extra/github-actions/workflows/main.yml
@@ -305,7 +305,11 @@ jobs:
           path: out/linux/arm64
 
   mac-build:
-    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-latest, macos-14]
+    runs-on: ${{ matrix.os }}
     env:
       PLATFORM: mac
       OPAMYES: 1