Enforce amd64 on osx

labellib has compile issues on osx arm64.
Fluorescence-Tools · Dec 7, 2024 · 9a96512 · 9a96512
1 parent 41164c0
commit 9a96512
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml
@@ -36,8 +36,6 @@ jobs:
           miniforge-version: latest
           channels: conda-forge,bioconda,tpeulen,defaults
           channel-priority: true
-        env:
-          CONDA_SUBDIR: ${{ matrix.os == 'macos-latest' && 'osx-64' || null }}
 
       - name: Display Conda Settings
         shell: bash -el {0}
@@ -53,5 +51,12 @@ jobs:
         with:
           shell: bash -el {0}
           run: |
-            conda install mamba conda-build boa anaconda-client
+            if [[ $RUNNER_OS == "macOS" ]]; then
+              echo "Running on macOS, exporting CONDA_SUBDIR=osx-amd64"
+              export CONDA_SUBDIR=osx-amd64
+            fi
+            echo "Creating build environment..."
+            conda create -y -n build-env python=${{ matrix.python-version }}
+            source activate build-env
+            conda install -y mamba conda-build boa anaconda-client
             conda mambabuild conda-recipe
diff --git a/.github/workflows/conda-release.yml b/.github/workflows/conda-release.yml
@@ -34,8 +34,6 @@ jobs:
           miniforge-version: latest
           channels: conda-forge,bioconda,tpeulen,defaults
           channel-priority: true
-        env:
-          CONDA_SUBDIR: ${{ matrix.os == 'macos-latest' && 'osx-64' || null }}
 
       - name: Display Conda Settings
         shell: bash -el {0}
@@ -51,7 +49,14 @@ jobs:
         with:
           shell: bash -el {0}
           run: |
-            conda install mamba conda-build boa anaconda-client
+            if [[ $RUNNER_OS == "macOS" ]]; then
+              echo "Running on macOS, exporting CONDA_SUBDIR=osx-amd64"
+              export CONDA_SUBDIR=osx-amd64
+            fi
+            echo "Creating build environment..."
+            conda create -y -n build-env python=${{ matrix.python-version }}
+            source activate build-env
+            conda install -y mamba conda-build boa anaconda-client
             cd conda-recipe
             conda mambabuild . --output-folder conda-bld
             anaconda -t ${{ secrets.ANACONDA_TOKEN }} upload -u tpeulen --force conda-bld/**/*.tar.bz2