diff --git a/.github/workflows/create-release-proposal.yml b/.github/workflows/create-release-proposal.yml index d3ffa3ad49b5e2..de8e91d98a3557 100644 --- a/.github/workflows/create-release-proposal.yml +++ b/.github/workflows/create-release-proposal.yml @@ -78,7 +78,7 @@ jobs: run: | git update-index --assume-unchanged tools/actions/create-release.sh curl -fsSLo tools/actions/create-release.sh https://github.com/${GITHUB_REPOSITORY}/raw/${GITHUB_SHA}/tools/actions/create-release.sh - ./tools/actions/create-release.sh "${RELEASE_DATE}" "${RELEASE_LINE}" + ./tools/actions/create-release.sh "${RELEASE_DATE}" "${RELEASE_LINE}" "${GITHUB_ACTOR}" env: GH_TOKEN: ${{ github.token }} # We want the bot to push the push the release commit so CI runs on it. diff --git a/tools/actions/create-release.sh b/tools/actions/create-release.sh index e3cfd76952a18b..17878ff2e40d86 100755 --- a/tools/actions/create-release.sh +++ b/tools/actions/create-release.sh @@ -7,6 +7,7 @@ BOT_TOKEN=${BOT_TOKEN:-} RELEASE_DATE=$1 RELEASE_LINE=$2 +RELEASER=$3 if [ -z "$RELEASE_DATE" ] || [ -z "$RELEASE_LINE" ]; then echo "Usage: $0 " @@ -48,7 +49,7 @@ PR_URL="$(gh api \ -H "Accept: application/vnd.github+json" \ -H "X-GitHub-Api-Version: 2022-11-28" \ "/repos/${GITHUB_REPOSITORY}/pulls" \ - -f "title=$TITLE" -f "body=$TEMP_BODY" -f "head=$HEAD_BRANCH" -f "base=v$RELEASE_LINE.x")" + -f "title=$TITLE" -f "body=$TEMP_BODY" -f "head=$HEAD_BRANCH" -f "base=v$RELEASE_LINE.x" -f draft=true)" # Push the release commit to the proposal branch using `BOT_TOKEN` from the env node --input-type=module - \ @@ -124,3 +125,5 @@ if (data.errors?.length) { } console.log(util.inspect(data, { depth: Infinity })); EOF + +gh pr edit "$PR_URL" --add-label release --add-assignee "$RELEASER"