Merge pull request conda#720 from maresb/revert-micromamba-v2-workaro…

…unds Unpin micromamba<2 in CI
maresb · Feb 3, 2025 · 82d1c4a · 82d1c4a
2 parents 15841fc + ff485cc
commit 82d1c4a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -17,7 +17,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  MICROMAMBA_VERSION: 'latest'
+  MICROMAMBA_VERSION: '2.0.6.rc1-0'
 
 defaults:
   run:
@@ -77,13 +77,21 @@ jobs:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
         python-version: [ "3.8" ]
     steps:
+      - name: Set Conda platform
+        run: |
+          if [ "$RUNNER_OS" == "Linux" ]; then
+            echo "CONDA_PLATFORM=linux-64" >> $GITHUB_ENV
+          elif [ "$RUNNER_OS" == "macOS" ]; then
+            echo "CONDA_PLATFORM=osx-arm64" >> $GITHUB_ENV
+          elif [ "$RUNNER_OS" == "Windows" ]; then
+            echo "CONDA_PLATFORM=win-64" >> $GITHUB_ENV
+          fi
+      - name: Verify Conda platform
+        run: echo "Conda platform is $CONDA_PLATFORM"
       - name: Install Conda environment with Micromamba
         uses: mamba-org/setup-micromamba@v2
         with:
-          # # Temporarily pin the version due to
-          # # <https://github.com/mamba-org/mamba/issues/3467>
-          # micromamba-version: ${{ env.MICROMAMBA_VERSION }}
-          micromamba-version: 1.5.10-0
+          micromamba-url: https://github.com/mamba-org/micromamba-releases/releases/download/${{ env.MICROMAMBA_VERSION }}/micromamba-${{ env.CONDA_PLATFORM }}
           init-shell: bash
       - name: Download lockfiles
         uses: actions/download-artifact@v4

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,10 +16,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  # # Temporarily pin the version due to
-  # # <https://github.com/mamba-org/mamba/issues/3467>
-  # MICROMAMBA_VERSION: 'latest'
-  MICROMAMBA_VERSION: '1.5.10-0'
+  MICROMAMBA_VERSION: '2.0.6.rc1-0'
 
 jobs:
   test:
@@ -91,9 +88,21 @@ jobs:
     steps:
       - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
 
+      - name: Set Conda platform
+        run: |
+          if [ "$RUNNER_OS" == "Linux" ]; then
+            echo "CONDA_PLATFORM=linux-64" >> $GITHUB_ENV
+          elif [ "$RUNNER_OS" == "macOS" ]; then
+            echo "CONDA_PLATFORM=osx-arm64" >> $GITHUB_ENV
+          elif [ "$RUNNER_OS" == "Windows" ]; then
+            echo "CONDA_PLATFORM=win-64" >> $GITHUB_ENV
+          fi
+      - name: Verify Conda platform
+        run: echo "Conda platform is $CONDA_PLATFORM"
+
       - uses: mamba-org/setup-micromamba@v2
         with:
-          micromamba-version: ${{ env.MICROMAMBA_VERSION }}
+          micromamba-url: https://github.com/mamba-org/micromamba-releases/releases/download/${{ env.MICROMAMBA_VERSION }}/micromamba-${{ env.CONDA_PLATFORM }}
           environment-file: environments/conda-lock.yml
           environment-name: conda-lock-dev
           init-shell: bash

diff --git a/tests/test_conda_lock.py b/tests/test_conda_lock.py
@@ -2673,6 +2673,7 @@ def test_fake_conda_env(conda_exe: str, conda_lock_yaml: Path):
                     conda_exe,
                     "list",
                     "--debug",
+                    "--no-pip",
                     "-p",
                     prefix,
                     "--json",