Skip to content

Commit aa12ef0

Browse files
committed
Do not create draft PRs where we did so to trigger workflows with ready_for_review before
1 parent e3a04b7 commit aa12ef0

4 files changed

Lines changed: 5 additions & 12 deletions

File tree

.github/actions/prepare-mergeback-branch/action.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,15 @@ runs:
9191
9292
Please do the following:
9393
94-
- [ ] Mark the PR as ready for review to trigger the full set of PR checks.
94+
- [ ] Approve running the full set of PR checks.
9595
- [ ] Approve and merge the PR. When merging the PR, make sure "Create a merge commit" is
9696
selected rather than "Squash and merge" or "Rebase and merge".
9797
EOF
9898
)
9999
100-
# PR checks won't be triggered on PRs created by Actions. Therefore mark the PR as draft
101-
# so that a maintainer can take the PR out of draft, thereby triggering the PR checks.
102100
gh pr create \
103101
--head "${NEW_BRANCH}" \
104102
--base "${BASE_BRANCH}" \
105103
--title "${pr_title}" \
106104
--body "${pr_body}" \
107-
--assignee "${GITHUB_ACTOR}" \
108-
--draft
105+
--assignee "${GITHUB_ACTOR}"

.github/update-release-branch.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ def open_pr(
136136
body.append(f' - [ ] Check that there are not any unexpected commits being merged into the `{target_branch}` branch.')
137137
body.append(' - [ ] Ensure the docs team is aware of any documentation changes that need to be released.')
138138

139-
body.append(' - [ ] Mark the PR as ready for review to trigger the full set of PR checks.')
139+
body.append(' - [ ] Approve running the full set of PR checks if you have not pushed any changes.')
140140
body.append(' - [ ] Approve and merge this PR. Make sure `Create a merge commit` is selected rather than `Squash and merge` or `Rebase and merge`.')
141141

142142
if is_primary_release:
@@ -146,9 +146,7 @@ def open_pr(
146146
title = f'Merge {source_branch} into {target_branch}'
147147

148148
# Create the pull request
149-
# PR checks won't be triggered on PRs created by Actions. Therefore mark the PR as draft so that
150-
# a maintainer can take the PR out of draft, thereby triggering the PR checks.
151-
pr = repo.create_pull(title=title, body='\n'.join(body), head=new_branch_name, base=target_branch, draft=True)
149+
pr = repo.create_pull(title=title, body='\n'.join(body), head=new_branch_name, base=target_branch)
152150
print(f'Created PR #{str(pr.number)}')
153151

154152
# Assign the conductor

.github/workflows/rebuild.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,5 @@ jobs:
143143
PR_NUMBER: ${{ github.event.pull_request.number }}
144144
run: |
145145
echo "Pushed a commit to rebuild the Action." \
146-
"Please mark the PR as ready for review to trigger PR checks." |
146+
"Please approve running the PR checks." |
147147
gh pr comment --body-file - --repo github/codeql-action "$PR_NUMBER"
148-
gh pr ready --undo --repo github/codeql-action "$PR_NUMBER"

.github/workflows/update-bundle.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ jobs:
114114
--title "Update default bundle to $cli_version" \
115115
--body "$pr_body" \
116116
--assignee "$GITHUB_ACTOR" \
117-
--draft \
118117
)
119118
echo "CLI_VERSION=$cli_version" | tee -a "$GITHUB_ENV"
120119
echo "PR_URL=$pr_url" | tee -a "$GITHUB_ENV"

0 commit comments

Comments
 (0)