Skip to content

Commit 4137152

Browse files
committed
Merge remote-tracking branch 'upstream/master' into basespend_adj
2 parents 0d72a5b + 4b32ef3 commit 4137152

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.github/workflows/build_and_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Setup Miniconda using Python ${{ matrix.python-version }}
3737
uses: conda-incubator/setup-miniconda@v3
3838
with:
39-
miniforge-variant: Mambaforge
39+
miniconda-version: "latest"
4040
auto-update-conda: true
4141
activate-environment: ogcore-dev
4242
environment-file: environment.yml

.github/workflows/deploy_docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Setup Miniconda
2525
uses: conda-incubator/setup-miniconda@v3
2626
with:
27-
miniforge-variant: Mambaforge
27+
miniconda-version: "latest"
2828
activate-environment: ogcore-dev
2929
environment-file: environment.yml
3030
python-version: "3.12"

.github/workflows/docs_check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup Miniconda
2323
uses: conda-incubator/setup-miniconda@v3
2424
with:
25-
miniforge-variant: Mambaforge
25+
miniconda-version: "latest"
2626
activate-environment: ogcore-dev
2727
environment-file: environment.yml
2828
python-version: "3.12"

0 commit comments

Comments
 (0)