-
Notifications
You must be signed in to change notification settings - Fork 0
Add the Staged Rollout Tracker and the Merge-Bot Caller Snippet #748
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
ef6d605
Add the Staged Rollout Tracker and the Merge-Bot Caller Snippet
ptr727 2f6ed9f
Make the Documented Merge-Bot Stub Match the Catalog Snippet
ptr727 6eb723f
Cite the Snippet's Pull Request and Say Stage Throughout the Cluster
ptr727 9d74ef8
Give Each Non-Carrying Repo Its Own Adoption Checkbox
ptr727 b5a8f35
Name the Proof Items and Separate the Merge-Bot Task From Its Adoption
ptr727 2cf5a57
Put the Permissions Fallback at the Caller
ptr727 1aa853b
Record the Snippet Pin as the Full Commit SHA
ptr727 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| name: Merge bot pull request action | ||
|
|
||
| # Thin caller: the merge-bot is the hub's reusable merge-bot-task.yml, which every fleet repo reaches rather than carries. | ||
| # The trigger is pull_request_target so the called workflow resolves from the trusted base rather than the PR head, and no job checks out PR code. | ||
| on: | ||
| pull_request_target: | ||
| types: [opened, reopened, synchronize] | ||
|
|
||
| # Concurrency keys on the PR number rather than on github.ref, which under pull_request_target is the base branch and would serialize every bot PR against it, so each PR queues independently. | ||
| # The cancel-in-progress setting is false so a follow-up synchronize does not cancel an in-flight opened run before it enables auto-merge. | ||
| concurrency: | ||
| group: ${{ github.workflow }}-${{ github.event.pull_request.number }} | ||
| cancel-in-progress: false | ||
|
|
||
| # Every write in the called workflow uses the App token, so GITHUB_TOKEN gets no scope. | ||
| permissions: {} | ||
|
|
||
| jobs: | ||
|
|
||
| merge-bot: | ||
| name: Merge bot pull request job | ||
| uses: ptr727/ProjectTemplate/.github/workflows/merge-bot-task.yml@20616e0a70613ad8727d567990f5d0e082f5275c # 2.0.338 | ||
| secrets: | ||
| CODEGEN_APP_CLIENT_ID: ${{ secrets.CODEGEN_APP_CLIENT_ID }} | ||
| CODEGEN_APP_PRIVATE_KEY: ${{ secrets.CODEGEN_APP_PRIVATE_KEY }} | ||
| # A repo with a tracker outside the built-in codegen and upstream-version pairs adds a with: block carrying a rules JSON array of head or head-prefix plus base. | ||
| # A repo that keeps the repository-wide auto-delete off and still wants bot branches gone sets delete-branch true in the same block. | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.