From 8ea4b53e359c4720c0816ef12f3543f324c3ac3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Guillemet?= <hg@apteryx.fr>
Date: Mon, 1 Jul 2024 07:59:32 +0200
Subject: [PATCH] Build macosx-arm64 on arm64 runner

---
 .github/actions/deploy-macosx/action.yml | 10 ++++++----
 .github/workflows/opencv.yml             |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/actions/deploy-macosx/action.yml b/.github/actions/deploy-macosx/action.yml
index 690321c6aaa..b2ffccde9f6 100644
--- a/.github/actions/deploy-macosx/action.yml
+++ b/.github/actions/deploy-macosx/action.yml
@@ -103,10 +103,12 @@ runs:
     - name: Build project
       shell: bash
       run: |
-        export LIBRARY_PATH="/usr/local/lib/gcc/10/"
-        export LD_LIBRARY_PATH="$LIBRARY_PATH"
-        export DYLD_LIBRARY_PATH="$LIBRARY_PATH"
-        export DYLD_FALLBACK_LIBRARY_PATH="$LIBRARY_PATH"
+        if [[ -n ${CI_DEPLOY_NEED_GCC:-} ]]; then
+          export LIBRARY_PATH="/usr/local/lib/gcc/10/"
+          export LD_LIBRARY_PATH="$LIBRARY_PATH"
+          export DYLD_LIBRARY_PATH="$LIBRARY_PATH"
+          export DYLD_FALLBACK_LIBRARY_PATH="$LIBRARY_PATH"
+        fi
 
         # Change default JVM on macos-14 runner
         if [[ -n ${JAVA_HOME_17_arm64:-} ]]; then
diff --git a/.github/workflows/opencv.yml b/.github/workflows/opencv.yml
index 742c9d1a56f..1de52f526d9 100644
--- a/.github/workflows/opencv.yml
+++ b/.github/workflows/opencv.yml
@@ -66,9 +66,9 @@ jobs:
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
   macosx-arm64:
-    runs-on: macos-12
+    runs-on: macos-14
     steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
+      - uses: HGuillemet/javacpp-presets/.github/actions/deploy-macosx@opencv_macosx_arm64
   macosx-x86_64:
     runs-on: macos-12
     steps: