Merge remote-tracking branch 'upstream/master' into basespend_adj

PSLmodels · Oct 2, 2024 · 4137152 · 4137152
2 parents 0d72a5b + 4b32ef3
commit 4137152
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Setup Miniconda using Python ${{ matrix.python-version }}
         uses: conda-incubator/setup-miniconda@v3
         with:
-          miniforge-variant: Mambaforge
+          miniconda-version: "latest"
           auto-update-conda: true
           activate-environment: ogcore-dev
           environment-file: environment.yml

diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Setup Miniconda
         uses: conda-incubator/setup-miniconda@v3
         with:
-          miniforge-variant: Mambaforge
+          miniconda-version: "latest"
           activate-environment: ogcore-dev
           environment-file: environment.yml
           python-version: "3.12"

diff --git a/.github/workflows/docs_check.yml b/.github/workflows/docs_check.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup Miniconda
         uses: conda-incubator/setup-miniconda@v3
         with:
-          miniforge-variant: Mambaforge
+          miniconda-version: "latest"
           activate-environment: ogcore-dev
           environment-file: environment.yml
           python-version: "3.12"