diff --git a/.github/workflows/CondaLock.yml b/.github/workflows/CondaLock.yml index 7aa749f2..5540d8c3 100644 --- a/.github/workflows/CondaLock.yml +++ b/.github/workflows/CondaLock.yml @@ -10,7 +10,7 @@ jobs: condalock: strategy: fail-fast: false - matrix: + matrix: IMAGE: [base-notebook, pangeo-notebook, ml-notebook, pytorch-notebook] name: ${{ matrix.IMAGE }} runs-on: ubuntu-latest @@ -38,12 +38,11 @@ jobs: - name: Run conda-lock ${{ matrix.IMAGE }} run: | cd ${{ matrix.IMAGE }} - rm conda-lock.yml if [ ${{ matrix.IMAGE }} = "base-notebook" ]; then conda-lock lock -f environment.yml -p linux-64 elif [ ${{ matrix.IMAGE }} = "pangeo-notebook" ]; then conda-lock lock -f environment.yml -f ../base-notebook/environment.yml -p linux-64 - else + else conda-lock lock -f environment.yml -f ../pangeo-notebook/environment.yml -f ../base-notebook/environment.yml -p linux-64 fi conda-lock render -k explicit @@ -68,10 +67,10 @@ jobs: # These lines are critical, otherwise Pangeo-bot pushes changes directly to master from PRs! repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }} ref: ${{ github.event.client_payload.pull_request.head.ref }} - + # Download all artifacts from previous matrix job - uses: actions/download-artifact@v3 - + - name: Commit condalock files to PR run: | git config --global user.name 'pangeo-bot' @@ -79,7 +78,7 @@ jobs: git add */conda*.lock */conda-lock.yml */packages.txt git commit -m "[condalock-command] autogenerated conda-lock files" git push - + - name: Add reaction uses: peter-evans/create-or-update-comment@v2 with: