diff --git a/.github/workflows/macos_arm64.yaml b/.github/workflows/macos_arm64.yaml index d868e7cd..4b1cce34 100644 --- a/.github/workflows/macos_arm64.yaml +++ b/.github/workflows/macos_arm64.yaml @@ -65,7 +65,6 @@ jobs: - uses: actions/checkout@v4 - name: Setup cmake run: | - export PATH="/opt/homebrew/bin:/opt/homebrew/sbin:$PATH" echo $PATH brew install cmake echo "check python3" @@ -109,8 +108,7 @@ jobs: submodules: true - name: Setup cmake run: | - ls -lrt /opt/homebrew/bin/ - /opt/homebrew/bin/brew install cmake + brew install cmake echo "check python3" python3 -c "import sys; print(sys.version)" - name: Get code of Fiona @@ -154,8 +152,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup cmake run: | - ls -lrt /opt/homebrew/bin/ - /opt/homebrew/bin/brew install cmake + brew install cmake echo "check python3" python3 -c "import sys; print(sys.version)" - name: Get code of gdal diff --git a/env_vars.sh b/env_vars.sh index 15cfb783..9b257369 100644 --- a/env_vars.sh +++ b/env_vars.sh @@ -18,6 +18,9 @@ export MACOSX_DEPLOYMENT_TARGET=11.0 if [ -z "$IS_OSX" ] || [ "$PLAT" == x86_64 ]; then export MACOSX_DEPLOYMENT_TARGET=13.0 fi +if [ -z "$IS_OSX" ] || [ "$PLAT" == arm_64 ]; then + export PATH="/opt/homebrew/bin:/opt/homebrew/sbin:$PATH" +fi export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 export GDAL_CONFIG=/usr/local/bin/gdal-config export PACKAGE_DATA=1