From bb2f4e7386a172640f2d6f7ac92abed92f2db08c Mon Sep 17 00:00:00 2001 From: Thomas-Otavio Peulen Date: Sat, 7 Dec 2024 18:21:35 +0100 Subject: [PATCH] Enforce amd64 on osx labellib has compile issues on osx arm64. --- .github/workflows/conda-build.yml | 5 +---- .github/workflows/conda-release.yml | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index 9534435e..6801bd4a 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -52,10 +52,7 @@ jobs: shell: bash -el {0} run: | # Check if RUNNER_OS is macOS and set CONDA_SUBDIR accordingly - if [[ "$RUNNER_OS" == "macOS" ]]; then - echo "Running on macOS, exporting CONDA_SUBDIR=osx-amd64" - export CONDA_SUBDIR=osx-amd64 - fi + if [[ "$RUNNER_OS" == "macOS" ]]; then export CONDA_SUBDIR=osx-amd64; fi # Create and activate the build environment echo "Creating build environment..." diff --git a/.github/workflows/conda-release.yml b/.github/workflows/conda-release.yml index 5549a6e8..e10dd245 100644 --- a/.github/workflows/conda-release.yml +++ b/.github/workflows/conda-release.yml @@ -50,10 +50,7 @@ jobs: shell: bash -el {0} run: | # Check if RUNNER_OS is macOS and set CONDA_SUBDIR accordingly - if [[ "$RUNNER_OS" == "macOS" ]]; then - echo "Running on macOS, exporting CONDA_SUBDIR=osx-amd64" - export CONDA_SUBDIR=osx-amd64 - fi + if [[ "$RUNNER_OS" == "macOS" ]]; then export CONDA_SUBDIR=osx-amd64; fi # Create and activate the build environment echo "Creating build environment..."