From 72f597d21bef43abbf0d7719f3e5c076f834bc2f Mon Sep 17 00:00:00 2001 From: Nicklas Larsson Date: Thu, 1 Feb 2024 20:37:31 +0100 Subject: [PATCH] fix --- .github/workflows/macos.yml | 1 + .github/workflows/macos_install.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 292f776ffd1..5c3923d5b3a 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -23,6 +23,7 @@ jobs: installer-url: "https://github.com/conda-forge/miniforge/releases/\ download/23.11.0-0/Mambaforge-23.11.0-0-MacOSX-arm64.sh" channels: conda-forge + architecture: arm64 miniforge-variant: Mambaforge activate-environment: grass-env use-mamba: true diff --git a/.github/workflows/macos_install.sh b/.github/workflows/macos_install.sh index e6b36e64680..9415aa870c1 100755 --- a/.github/workflows/macos_install.sh +++ b/.github/workflows/macos_install.sh @@ -10,7 +10,8 @@ fi # recommended in https://gitter.im/conda-forge/conda-forge.github.io?at=5c40da7f95e17b45256960ce find ${CONDA_PREFIX}/lib -name '*.la' -delete -CONDA_ARCH=$(uname -m) +CONDA_ARCH=arm64 +# $(uname -m) INSTALL_PREFIX=$1 CONFIGURE_FLAGS="\