focus on mamba/miniforge

luhipi · Nov 5, 2024 · ce8ed61 · ce8ed61
1 parent 220b881
commit ce8ed61
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,7 +36,6 @@ jobs:
         run: |
           conda init bash
           source ~/.bashrc
-          conda info
           source activate ci_env
         shell: bash
 
@@ -59,7 +58,7 @@ jobs:
           source ~/.bashrc
           mamba env remove --name ci_temp_env --yes || echo "Environment ci_temp_env does not exist"
 
-          conda create -n ci_temp_env --clone ci_env
+          mamba create -n ci_temp_env --clone ci_env
           source activate ci_temp_env
           mamba install json5
           rm -rf tests/testdata
@@ -131,7 +130,6 @@ jobs:
         run: |
           conda init bash
           source ~/.bashrc
-          conda info
           source activate ci_env
           make lint
         shell: bash
@@ -174,7 +172,6 @@ jobs:
         run: |
           conda init bash
           source ~/.bashrc
-          conda info
           source activate ci_env
           make urlcheck
         shell: bash
@@ -194,7 +191,7 @@ jobs:
           if: env.SKIP_INSTALL == 'false'
           run: |
               source $HOME/miniconda/bin/activate
-              mamba update -n base mamba conda
+              mamba update -n base
               mamba info
               mamba env remove --name sarvey_testinstall --yes || echo "Environment sarvey_testinstall does not exist"
               pip install conda-merge

diff --git a/tests/CI_docker/context/sarvey_ci.docker b/tests/CI_docker/context/sarvey_ci.docker
@@ -1,4 +1,4 @@
-FROM condaforge/mambaforge:latest as conda
+FROM condaforge/miniforge3:latest
 
 # update base environment
 RUN --mount=type=cache,target=/opt/conda/pkgs \