diff --git a/.github/actions/deploy-macosx/action.yml b/.github/actions/deploy-macosx/action.yml index 690321c6aa..b2ffccde9f 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 742c9d1a56..1de52f526d 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: