Skip to content

Commit

Permalink
Merge pull request #7872 from fstagni/cherry-pick-2-bb24b5c9a-integra…
Browse files Browse the repository at this point in the history
…tion

[sweep:integration] fix: from mambaforge to miniforge
  • Loading branch information
fstagni authored Nov 6, 2024
2 parents a461a40 + a6f2751 commit 3789abb
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
- uses: actions/checkout@v4
- name: Fail-fast for outdated pipelines
run: .github/workflows/fail-fast.sh
- uses: mamba-org/setup-micromamba@v2
- uses: conda-incubator/setup-miniconda@v3
with:
environment-file: environment.yml

Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/cvmfs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ jobs:
deploy_CVMFS:
runs-on: "ubuntu-latest"
steps:
- uses: mamba-org/setup-micromamba@v2
- uses: conda-incubator/setup-miniconda@v3
with:

mamba-version: "*"
channels: conda-forge,defaults
channel-priority: true
- name: Deploy on CVMFS
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,8 @@ jobs:
if: github.event_name == 'workflow_dispatch'
needs: deploy-pypi
steps:
- uses: mamba-org/setup-micromamba@v2
- uses: conda-incubator/setup-miniconda@v3
with:

mamba-version: "*"
channels: conda-forge,defaults
channel-priority: true
- name: Deploy on CVMFS
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 2
build:
os: ubuntu-20.04
os: ubuntu-24.04
tools:
python: mambaforge-4.10
sphinx:
Expand Down

0 comments on commit 3789abb

Please sign in to comment.