Skip to content

Commit aeab884

Browse files
committed
Switched from Mambaforge to Miniforge for the docs build process. reverted conda file back
1 parent 30d82b6 commit aeab884

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

.github/workflows/conda.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
echo "date=$(/bin/date -u "+%Y%V")" >> $GITHUB_OUTPUT
3232
shell: bash
3333

34-
- name: Cache Conda and Pip packages
34+
- name: Cache Miniforge and Pip packages
3535
uses: actions/cache@v4
3636
env:
3737
CACHE_NUMBER: 0
@@ -42,14 +42,15 @@ jobs:
4242
key:
4343
${{runner.os}}-condapkg-${{env.CACHE_NUMBER}}-${{steps.get-date.outputs.date}}-${{hashFiles('environment-dev.yml','conda/meta.yaml')}}
4444

45-
- name: Cache Conda environment
45+
- name: Cache Miniforge environment
4646
uses: actions/cache@v4
47-
id: cache-conda-environment
47+
id: cache-miniforge-environment
4848
env:
4949
CACHE_NUMBER: 0
5050
with:
5151
path: ${CONDA}/envs/mantidimaging-dev.cache
52-
key: ${{runner.os}}-condaenv-${{env.CACHE_NUMBER}}-${{steps.get-date.outputs.date}}-${{hashFiles('environment-dev.yml','conda/meta.yaml', 'setup.py')}}
52+
key:
53+
${{runner.os}}-condaenv-${{env.CACHE_NUMBER}}-${{steps.get-date.outputs.date}}-${{hashFiles('environment-dev.yml','conda/meta.yaml', 'setup.py')}}
5354

5455
- name: Setup Miniforge
5556
uses: conda-incubator/setup-miniconda@v3
@@ -60,15 +61,15 @@ jobs:
6061
use-mamba: true
6162

6263
- name: Mantid Imaging developer dependencies
63-
if: steps.cache-conda-environment.outputs.cache-hit != 'true'
64+
if: steps.cache-miniforge-environment.outputs.cache-hit != 'true'
6465
shell: bash -l {0}
6566
run: |
6667
conda deactivate
6768
python3 ./setup.py create_dev_env
6869
cp -Ta ${CONDA}/envs/mantidimaging-dev ${CONDA}/envs/mantidimaging-dev.cache
6970
7071
- name: Mantid Imaging developer dependencies - from cache
71-
if: steps.cache-conda-environment.outputs.cache-hit == 'true'
72+
if: steps.cache-miniforge-environment.outputs.cache-hit == 'true'
7273
shell: bash -l {0}
7374
run: |
7475
cp -Ta ${CONDA}/envs/mantidimaging-dev.cache ${CONDA}/envs/mantidimaging-dev
@@ -145,4 +146,4 @@ jobs:
145146
with:
146147
label: unstable
147148
token: ${{ secrets.ANACONDA_API_TOKEN_MANTIDIMAGING }}
148-
token-old: ${{ secrets.ANACONDA_API_TOKEN }}
149+
token-old: ${{ secrets.ANACONDA_API_TOKEN }}

.github/workflows/docs.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
echo "date=$(/bin/date -u "+%Y%V")" >> $GITHUB_OUTPUT
2828
shell: bash
2929

30-
- name: Cache Mambaforge and Pip packages
30+
- name: Cache Miniforge and Pip packages
3131
uses: actions/cache@v4
3232
env:
3333
CACHE_NUMBER: 0
@@ -38,35 +38,34 @@ jobs:
3838
key:
3939
${{runner.os}}-condapkg-${{env.CACHE_NUMBER}}-${{steps.get-date.outputs.date}}-${{hashFiles('environment-dev.yml','conda/meta.yaml')}}
4040

41-
- name: Cache Mambaforge environment
41+
- name: Cache Miniforge environment
4242
uses: actions/cache@v4
43-
id: cache-mambaforge-environment
43+
id: cache-miniforge-environment
4444
env:
4545
CACHE_NUMBER: 0
4646
with:
4747
path: ${CONDA}/envs/mantidimaging-dev.cache
4848
key:
4949
${{runner.os}}-condaenv-${{env.CACHE_NUMBER}}-${{steps.get-date.outputs.date}}-${{hashFiles('environment-dev.yml','conda/meta.yaml')}}
5050

51-
- name: Setup Mambaforge
51+
- name: Setup Miniforge
5252
uses: conda-incubator/setup-miniconda@v3
5353
with:
5454
miniforge-version: latest
55-
miniforge-variant: Mambaforge
5655
activate-environment: mantidimaging-dev
5756
auto-activate-base: false
5857
use-mamba: true
5958

6059
- name: Mantid Imaging developer dependencies
61-
if: steps.cache-mambaforge-environment.outputs.cache-hit != 'true'
60+
if: steps.cache-miniforge-environment.outputs.cache-hit != 'true'
6261
shell: bash -l {0}
6362
run: |
6463
conda deactivate
6564
python3 ./setup.py create_dev_env
6665
cp -Ta ${CONDA}/envs/mantidimaging-dev ${CONDA}/envs/mantidimaging-dev.cache
6766
6867
- name: Mantid Imaging developer dependencies - from cache
69-
if: steps.cache-mambaforge-environment.outputs.cache-hit == 'true'
68+
if: steps.cache-miniforge-environment.outputs.cache-hit == 'true'
7069
shell: bash -l {0}
7170
run: |
7271
cp -Ta ${CONDA}/envs/mantidimaging-dev.cache ${CONDA}/envs/mantidimaging-dev

0 commit comments

Comments
 (0)