From 7b0238fd7e96b901a36f50d48a74bd4445fbd278 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 7 Mar 2022 13:41:31 -0600 Subject: [PATCH] ci: Scope version bump branch name (#3894) This avoids a situation such as for the last point release where we had different point releases all use the same branch name which forced us make one release at a time. By putting the version number in the branch name that should hopefully fix this. --- .github/workflows/bump-version.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index 6f265eb6f1..a162d3c400 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -60,7 +60,7 @@ jobs: - name: Push to remote run: | git remote set-url origin https://git:${{ secrets.PERSONAL_ACCESS_TOKEN }}@github.com/${{ github.repository }} - git push origin HEAD:ci/bump-version -f + git push origin HEAD:ci/bump-to-${{ steps.bump.outputs.version }} -f - name: Make a PR # Note that the syntax here is kinda funky, and the general gist is that @@ -91,7 +91,7 @@ jobs: --header "Authorization: token ${{ secrets.PERSONAL_ACCESS_TOKEN }}" \ --data @- << EOF { - "head": "ci/bump-version", + "head": "ci/bump-to-${{ steps.bump.outputs.version }}", "base": "${{ github.ref_name }}", "title": "Release Wasmtime ${{ steps.bump.outputs.version }}", "body": $body,