Use official conda-action

OGGM · Aug 20, 2024 · 73cd54b · 73cd54b
1 parent 75ae049
commit 73cd54b
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 31 deletions.
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -12,11 +12,24 @@ jobs:
   packages:
     name: Build Packages
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup Conda
-        run: ./ci/setup-conda.sh
+        uses: conda-incubator/setup-miniconda@v3
+        with:
+          auto-update-conda: true
+          auto-activate-base: true
+          activate-environment: ""
+          channel-priority: strict
+          channels: conda-forge
+      - name: Install global deps
+        run: |
+          conda install conda-build anaconda-client
+          conda info -a
       - name: Build Pytest-Mpl
         run: ./ci/build-package.sh pytest-mpl
         env:
@@ -44,11 +57,24 @@ jobs:
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ contains(matrix.os, 'windows') }}
+    defaults:
+      run:
+        shell: bash
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup Conda
-        run: ./ci/setup-conda.sh
+        uses: conda-incubator/setup-miniconda@v3
+        with:
+          auto-update-conda: true
+          auto-activate-base: true
+          activate-environment: ""
+          channel-priority: strict
+          channels: conda-forge
+      - name: Install global deps
+        run: |
+          conda install conda-build anaconda-client
+          conda info -a
       - name: Make Env
         run: ./ci/make-env.sh
         env:

diff --git a/ci/activate-conda.sh b/ci/activate-conda.sh
diff --git a/ci/build-package.sh b/ci/build-package.sh
@@ -1,10 +1,12 @@
 #!/bin/bash
 set -e
 
-cd "$(dirname "$0")"
-source ./activate-conda.sh
+function RQ() {
+    echo ">>>" "$@"
+    "$@"
+}
 
-cd ..
+cd "$(dirname "$0")"/..
 
 PKG="$1"
 MF="./build/$1/meta.yaml"
@@ -35,6 +37,8 @@ echo
 echo "Done building"
 echo
 
+anaconda --version
+
 for i in "$CONDA_BLD_PATH"/*/*.tar.bz2; do
     echo
 	echo "Uploading $(basename $i)"

diff --git a/ci/make-env.sh b/ci/make-env.sh
@@ -1,10 +1,12 @@
 #!/bin/bash
 set -e
 
-cd "$(dirname "$0")"
-source ./activate-conda.sh
+function RQ() {
+    echo ">>>" "$@"
+    "$@"
+}
 
-cd ..
+cd "$(dirname "$0")"/..
 
 export MPLBACKEND=agg
 export OGGM_USE_MP_SPAWN=1

diff --git a/ci/setup-conda.sh b/ci/setup-conda.sh