Skip to content

Commit 83f76ac

Browse files
sergicalclaude
andauthored
ci: Fix bump-api-schema workflow to merge PRs immediately (#16827)
## DESCRIBE YOUR PR The `bump-api-schema-sha.yml` workflow creates PRs with `--auto` merge, but checks never pass — causing a pile-up of open "Bump API schema" PRs. Since getsentry bot has been added to bypass PR requirements, we can use `--admin` to merge immediately. Changes: - Add no-op guard after `sed` to skip when the SHA is unchanged (prevents duplicate PRs) - Switch `gh pr merge --squash --auto` → `gh pr merge --squash --admin` (bypass branch protections, merge immediately) ## IS YOUR CHANGE URGENT? - [ ] Urgent deadline (GA date, etc.): - [ ] Other deadline: - [x] None: Not urgent, can wait up to 1 week+ ## SLA - Teamwork makes the dream work, so please add a reviewer to your PRs. - Please give the docs team up to 1 week to review your PR unless you've added an urgent due date to it. Thanks in advance for your help! ## PRE-MERGE CHECKLIST - [x] Checked Vercel preview for correctness, including links - [ ] PR was reviewed and approved by any necessary SMEs (subject matter experts) - [ ] PR was reviewed and approved by a member of the [Sentry docs team](https://github.com/orgs/getsentry/teams/docs) Co-authored-by: Claude <noreply@anthropic.com>
1 parent 4c7932e commit 83f76ac

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

.github/workflows/bump-api-schema-sha.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,16 @@ jobs:
3939
sed -i -e "s|^const SENTRY_API_SCHEMA_SHA =.*$|const SENTRY_API_SCHEMA_SHA = '$sha';|g" "$filepath"
4040
echo "Updated $filepath"
4141
42+
if git diff --quiet "$filepath"; then
43+
echo "No changes to $filepath, skipping."
44+
exit 0
45+
fi
46+
4247
branch="bot/bump-api-schema-to-${sha:0:8}"
4348
git checkout -b "$branch"
4449
git add "$filepath"
4550
git commit -m "Bump API schema to ${sha:0:8}"
4651
git push --set-upstream origin "$branch"
4752
4853
gh pr create --fill
49-
gh pr merge --squash --auto
54+
gh pr merge --squash --admin

0 commit comments

Comments
 (0)