Fix CI (#163)

cnio-bu · Sep 13, 2024 · 3e7ae59 · 3e7ae59
1 parent c95ea5b
commit 3e7ae59
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/conda_build.yml b/.github/workflows/conda_build.yml
@@ -19,24 +19,30 @@ jobs:
             label: linux-64
             prefix: /usr/share/miniconda3/envs/bc_builds
 
-          - os: macos-latest
+          - os: macos-13
             label: osx-64
             prefix: /Users/runner/miniconda3/envs/bc_builds
 
     name: ${{ matrix.label }}
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Setup Mambaforge
-        uses: conda-incubator/setup-miniconda@v2
+      - name: Setup Miniforge
+        uses: conda-incubator/setup-miniconda@v3
         with:
-            miniforge-variant: Mambaforge
+            miniforge-variant: Miniforge3
             miniforge-version: latest
             activate-environment: bc_builds
-            conda-version: "23.5.2"
             use-mamba: true
 
+      - name: Ensure Python 3.11 is installed in base environment
+        run: mamba install --name base python=3.11
+
+      - name: Update Conda and Mamba
+        run: |
+          mamba install --name base conda=23.5.2
+          
       - name: Update beyondcell environment
         run: mamba update -n bc_builds -f helpers/mambabuild.yml
 

diff --git a/.github/workflows/r-beyondcell/meta.yaml b/.github/workflows/r-beyondcell/meta.yaml
@@ -36,7 +36,7 @@ requirements:
     - r-seuratobject >=4.0.0,<5.0.0
     - r-viridis >=0.5.1
     - r-matrix ==1.6_1.1
-    - r-parallelly ==1.36.0
+    - r-parallelly >=1.36.0
 
   run:
     - r-base >=4.0.0
@@ -52,7 +52,7 @@ requirements:
     - r-seuratobject >=4.0.0,<5.0.0
     - r-viridis >=0.5.1
     - r-matrix ==1.6_1.1
-    - r-parallelly ==1.36.0
+    - r-parallelly >=1.36.0
 
 test:
   commands: