From c3ba51858719a198ebd2338a3cd7064ecfb245c2 Mon Sep 17 00:00:00 2001
From: RblSb <msrblsb@gmail.com>
Date: Fri, 9 Feb 2024 18:14:06 +0300
Subject: [PATCH] start messing

---
 .github/workflows/main.yml              | 18 +++++++++++++++---
 extra/github-actions/build-mac.yml      | 12 ++++++++++--
 extra/github-actions/workflows/main.yml |  6 +++++-
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8f005256ba7..07349d1beec 100644
--- 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
index 518912aff7a..fcf5eff8f32 100644
--- 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
index 2d6198b37da..7492a6bae5e 100644
--- 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