chore(CI): add a rebase gha for the mutations branch #1592
Conversation
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
imabhichow
reviewed
Jun 26, 2025
Comment on lines
52
to
65
| - name: Create issue on rebase failure | ||
| if: steps.rebase.outputs.rebase_status == 'failed' | ||
| uses: actions/github-script@v6 | ||
| with: | ||
| github-token: ${{ secrets.GITHUB_TOKEN }} | ||
| script: | | ||
| github.rest.issues.create({ | ||
| owner: context.repo.owner, | ||
| repo: context.repo.repo, | ||
| title: 'Rebase failed for mutations branch', | ||
| body: `The automatic rebase of the \`mutations\` branch failed due to conflicts.\n\n` + | ||
| `This happened after a push to the default branch by ${context.actor}.\n\n` + | ||
| `Please resolve the conflicts manually.` | ||
| }) |
Contributor
There was a problem hiding this comment.
Out of curiosity, do we create a new GHI for each commit that has conflicts or will it be added to an already cut GHI?
Contributor
There was a problem hiding this comment.
Since there is no UUID or other reference in scope, it probably will create a new GHI.
Contributor
Author
There was a problem hiding this comment.
create a new one for each commit - highly overkill and will create lots of noise. We may opt for a different alert mechanism.
| with: | ||
| github-token: ${{ secrets.GITHUB_TOKEN }} | ||
| script: | | ||
| github.rest.issues.create({ |
Member
There was a problem hiding this comment.
Non blocking suggestions: We could also add a tag to the github issue
texastony
approved these changes
Jun 28, 2025
Contributor
|
Question: Would we need to collapse from 3 PRs/branches to just one? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Issue #, if available:
Description of changes:
Squash/merge commit message, if applicable:
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.