Merge pull request #85 from scipp/anaconda_not_found

Fix anaconda not found
scipp · Jan 18, 2022 · 3b4238f · 3b4238f
2 parents 29a11f2 + 37a86c9
commit 3b4238f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,6 +3,10 @@ name: Build
 on:
   workflow_call:
 
+defaults:
+  run:
+    shell: bash -l {0}  # required for conda env
+
 jobs:
   formatting:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -2,18 +2,25 @@ name: Deploy
 
 on:
   workflow_call:
+    secrets:
+      anaconda_token:
+        required: true
+
+defaults:
+  run:
+    shell: bash -l {0}  # required for conda env
 
 jobs:
   deploy:
     runs-on: ubuntu-latest
     env:
       conda_label: ${{ startsWith(github.ref, 'refs/tags/') && 'main' || 'dev' }}
     steps:
-      - uses: actions/checkout@v2  # Need to checkout repo so github-pages-deploy-action works
-      - uses: actions/download-artifact@v2
       - uses: conda-incubator/setup-miniconda@v2
       - run: conda install -c conda-forge --yes anaconda-client
-      - run: anaconda --token ${{ secrets.ANACONDATOKEN }} upload --user scipp --label ${{ env.conda_label }} $(ls conda-package-*/*/*.tar.bz2)
+      - uses: actions/checkout@v2  # Need to checkout repo so github-pages-deploy-action works
+      - uses: actions/download-artifact@v2
+      - run: anaconda --token ${{ secrets.anaconda_token }} upload --user scipp --label ${{ env.conda_label }} $(ls conda-package-*/*/*.tar.bz2)
 
       - uses: JamesIves/github-pages-deploy-action@v4.2.2
         with:

diff --git a/.github/workflows/weekly_and_release.yml b/.github/workflows/weekly_and_release.yml
@@ -14,3 +14,5 @@ jobs:
   deploy:
     needs: build
     uses: scipp/ess/.github/workflows/deploy.yml@main
+    secrets:
+      anaconda_token: ${{ secrets.ANACONDATOKEN }}