Merge pull request #201 from MetOffice/conda-lock-update-fix

Use hash of updated lock files in branch name
MetOffice · Nov 7, 2023 · c7905a0 · c7905a0
2 parents 1d35f03 + 63f320b
commit c7905a0
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/.github/workflows/conda-lock.yml b/.github/workflows/conda-lock.yml
@@ -17,7 +17,7 @@ jobs:
 
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.x"
+          python-version: "3.11"
 
       - name: Install dependencies
         run: python3 -m pip install tox tox-conda
@@ -36,7 +36,7 @@ jobs:
         run: |
           git config --local user.name "$GITHUB_ACTOR"
           git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com"
-          git switch -c "conda-lock-$(sha256sum ${{ runner.temp }}/lock_file_hashes | head -c 8)"
+          git switch -c "conda-lock-files"
           tox -e py39-lock,py310-lock,py311-lock
 
       - name: Create pull requests
@@ -47,9 +47,10 @@ jobs:
             echo "Lock files unchanged. Skipping pull request..."
             exit 0
           fi
+          # Update lock_file_hashes so pushed branch name is unique.
+          sha256sum requirements/* > ${{ runner.temp }}/lock_file_hashes
           git add requirements/locks/*.txt
           git commit -m "[CI] Update conda lock files"
-          git push --set-upstream origin "conda-lock-$(sha256sum ${{ runner.temp }}/lock_file_hashes | head -c 8)"
+          git push --set-upstream origin "conda-lock-files:conda-lock-$(sha256sum ${{ runner.temp }}/lock_file_hashes | head -c 8)"
           # Create PR on GitHub using GitHub CLI.
-          gh pr create --base main --title "[CI] Update conda lock files" \
-          --body "Created automatically by GitHub Actions."
+          gh pr create --base main --title "[CI] Update conda lock files" --body "Created automatically by GitHub Actions."