Skip to content

Commit b5e42b0

Browse files
authored
Merge pull request #142 from xylar/omega/ci/remove-mamba
Remove mamba(forge) from CI and dev conda instructions
2 parents 48686a7 + f30ba73 commit b5e42b0

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed

.github/workflows/omega-build-workflow.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
workflow_dispatch:
1111

1212
env:
13-
CANCEL_OTHERS: true
13+
CANCEL_OTHERS: false
1414
PATHS_IGNORE: '["**/README.md", "**/doc/**"]'
1515

1616
jobs:
@@ -52,10 +52,7 @@ jobs:
5252
uses: conda-incubator/setup-miniconda@v2
5353
with:
5454
activate-environment: "omega_ci"
55-
miniforge-variant: Mambaforge
5655
miniforge-version: latest
57-
use-mamba: true
58-
mamba-version: "*"
5956
channels: conda-forge,defaults
6057
channel-priority: strict
6158
auto-update-conda: true
@@ -64,10 +61,10 @@ jobs:
6461
- if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
6562
name: Install dependencies
6663
run: |
67-
mamba create -n omega_dev --file components/omega/dev-conda.txt \
64+
conda create -n omega_dev --file components/omega/dev-conda.txt \
6865
python=${{ matrix.python-version }}
6966
conda activate omega_dev
70-
mamba list
67+
conda list
7168
7269
- if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
7370
id: file_changes

.github/workflows/omega-docs-workflow.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,7 @@ jobs:
3434
uses: conda-incubator/setup-miniconda@v2
3535
with:
3636
activate-environment: "omega_ci"
37-
miniforge-variant: Mambaforge
3837
miniforge-version: latest
39-
use-mamba: true
40-
mamba-version: "*"
4138
channels: conda-forge,defaults
4239
channel-priority: strict
4340
auto-update-conda: true
@@ -46,10 +43,10 @@ jobs:
4643
- if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
4744
name: Install dependencies
4845
run: |
49-
mamba create -n omega_dev --file components/omega/dev-conda.txt \
46+
conda create -n omega_dev --file components/omega/dev-conda.txt \
5047
python=${{ matrix.python-version }}
5148
conda activate omega_dev
52-
mamba list
49+
conda list
5350
5451
- name: Build Sphinx Docs
5552
run: |

components/omega/dev-conda.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This file may be used to create an environment for linting Omega with
22
# pre-commit using:
3-
# $ mamba create -n omega_dev --file <this file>
4-
# $ mamba activate omega_dev
3+
# $ conda create -n omega_dev --file <this file>
4+
# $ conda activate omega_dev
55
# $ pre-commit install
66

77
# linting

0 commit comments

Comments
 (0)