From dec8836af7eda119c47a22c2b872189da8e78b66 Mon Sep 17 00:00:00 2001 From: James Frost Date: Thu, 5 Oct 2023 15:56:31 +0100 Subject: [PATCH] Use hash of updated lock files in branch name This prevents the workflow failing when the previous branch hasn't been merged. It was finding the branch already existed on the remote and failing. --- .github/workflows/conda-lock.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/conda-lock.yml b/.github/workflows/conda-lock.yml index 35a2e3ec2..9af6ede90 100644 --- a/.github/workflows/conda-lock.yml +++ b/.github/workflows/conda-lock.yml @@ -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)" # 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."