Use gcc. Add gcc@10 on macos-14 runner

bytedeco · Jun 30, 2024 · 2d38a2e · 2d38a2e
1 parent 27731f2
commit 2d38a2e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/actions/deploy-macosx/action.yml b/.github/actions/deploy-macosx/action.yml
@@ -25,7 +25,7 @@ runs:
         fi
 
         brew uninstall --force --ignore-dependencies gcc gcc@7 gcc@8 gcc@9 gcc@10 gcc@11 gcc@12 gcc@13 little-cms2 maven openblas r
-        brew install boost ccache swig autoconf-archive automake cmake libomp libtool libusb ant nasm xz pkg-config sdl2 gpg1 bison flex perl ragel binutils gradle gmp isl libmpc mpfr geoip pcre ssdeep yajl
+        brew install boost ccache swig autoconf-archive automake cmake gcc@10 libomp libtool libusb ant nasm xz pkg-config sdl2 gpg1 bison flex perl ragel binutils gradle gmp isl libmpc mpfr geoip pcre ssdeep yajl
         brew link --force libomp
 
         # echo Installing an older less buggy version of CMake

diff --git a/.github/workflows/scipy.yml b/.github/workflows/scipy.yml
@@ -10,6 +10,7 @@ on:
       - .github/workflows/scipy.yml
   workflow_dispatch:
 env:
+  CI_DEPLOY_NEED_GCC: 1
   CI_DEPLOY_MODULE: ${{ github.workflow }}
   CI_DEPLOY_PLATFORM: ${{ github.job }}
   CI_DEPLOY_SETTINGS: ${{ secrets.CI_DEPLOY_SETTINGS }}
@@ -40,11 +41,11 @@ jobs:
   macosx-arm64:
     runs-on: macos-14
     steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
+      - uses: HGuillemet/javacpp-presets/.github/actions/deploy-macosx@scipy-macosx-arm64
   macosx-x86_64:
     runs-on: macos-12
     steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
+      - uses: HGuillemet/javacpp-presets/.github/actions/deploy-macosx@scipy-macosx-arm64
 #  windows-x86:
 #    runs-on: windows-2019
 #    steps: