From fe104606c2b58e1044e178d9a0ebd71e930b821a Mon Sep 17 00:00:00 2001
From: Simon Perkins <simon.perkins@gmail.com>
Date: Wed, 9 Oct 2024 16:52:40 +0200
Subject: [PATCH] Iterate

---
 .github/workflows/ci.yml       | 12 ------------
 ci/scripts/run_cibuildwheel.sh | 10 ++++++++--
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 34868d3a..7adeb0f6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -149,18 +149,6 @@ jobs:
             LD_LIBRARY_PATH=${{ env.VCPKG_INSTALLED_DIR }}/${{ matrix.triplet }}/lib
         run: echo "CIBW_ENVIRONMENT_COMMON=$COMMON_ENV" >> $GITHUB_ENV
 
-      - name: Install conda for macos
-        if: ${{ matrix.os_short == 'macos' }}
-        run: |
-          set -ex
-          curl -L -O "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh"
-
-          # Install miniforge
-          MINIFORGE_PATH=$HOME/miniforge
-          bash Miniforge3-$(uname)-$(uname -m).sh -b -p $MINIFORGE_PATH
-          echo "$MINIFORGE_PATH/bin" >> $GITHUB_PATH
-          echo "CONDA_HOME=$MINIFORGE_PATH" >> $GITHUB_ENV
-
       - name: Run cibuildwheel
         env:
           CIBW_BUILD: ${{ matrix.cpython }}-${{ matrix.extra_build }}
diff --git a/ci/scripts/run_cibuildwheel.sh b/ci/scripts/run_cibuildwheel.sh
index a5319d97..69f91d4a 100755
--- a/ci/scripts/run_cibuildwheel.sh
+++ b/ci/scripts/run_cibuildwheel.sh
@@ -23,8 +23,14 @@ if [[ $(uname) == "Darwin" ]]; then
   # export CXXFLAGS="$CXXFLAGS -I$PREFIX/include"
   # export LDFLAGS="$LDFLAGS -Wl,-rpath,$PREFIX/lib -L$PREFIX/lib -lomp"
 
-  conda create -n arcae-build llvm-openmp compilers python
-  conda init
+
+  curl -L -O "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh"
+
+  # Install miniforge
+  MINIFORGE_PATH=$HOME/miniforge
+  bash Miniforge3-$(uname)-$(uname -m).sh -b -p $MINIFORGE_PATH
+  source "${MINFORGE_PATH}/etc/profile.d/conda.sh"
+  conda create -n arcae-build -c conda-forge compilers llvm-openmp python
   conda activate arcae-build
 fi