-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
chore(ci): auto-merge release branch into main daily at 4am CST #7852
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
4 commits
Select commit
Hold shift + click to select a range
5dd5e4f
chore(ci): auto-merge release branch into main daily at 4am CST
jdx 96db180
chore(ci): add auto-merge workflow for release branch
jdx 81ba6fa
fix(ci): add repository flag to gh commands in auto-merge workflow
jdx 876832e
fix(ci): handle empty PR list in auto-merge workflow
jdx 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| name: auto-merge-release | ||
|
|
||
| on: | ||
| schedule: | ||
| # 10:00 UTC = 4am CST (winter) / 5am CDT (summer) | ||
| - cron: "0 10 * * *" | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| merge: | ||
| if: github.repository == 'jdx/mise' | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Merge release into main | ||
| run: | | ||
| # Check if there's an open PR from release to main | ||
| PR_NUMBER=$(gh pr list -R jdx/mise --base main --head release --state open --json number --jq '.[0].number // empty') | ||
| if [ -z "$PR_NUMBER" ]; then | ||
| echo "No open PR from release to main" | ||
| exit 0 | ||
| fi | ||
|
|
||
| echo "Found PR #$PR_NUMBER" | ||
|
|
||
| # Enable auto-merge which waits for CI checks to pass | ||
| gh pr merge "$PR_NUMBER" -R jdx/mise --merge --auto || { | ||
| echo "Merge failed or PR not ready, will retry tomorrow" | ||
| exit 0 | ||
| } | ||
| env: | ||
| GH_TOKEN: ${{ secrets.MISE_GH_TOKEN }} | ||
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.