-
Notifications
You must be signed in to change notification settings - Fork 7
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
feat: Add gha for merging prod into main #715
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
1e24f4b
feat: Add gha for merging prod into main
alldoami 291af22
comment
alldoami 5877c93
add automerge functionality
alldoami a3aa1d6
new code that works
alldoami 382a497
update title
alldoami b80c467
Merge branch 'main' into adoami/prod-into-main-action
alldoami 52be6c0
semicolon
alldoami 31f4faf
merge
alldoami d0078bc
Merge branch 'main' into adoami/prod-into-main-action
alldoami b627558
Merge branch 'main' into adoami/prod-into-main-action
masoudmanson 39fb135
Merge branch 'main' into adoami/prod-into-main-action
masoudmanson 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 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 |
---|---|---|
|
@@ -89,6 +89,55 @@ jobs: | |
config: .github/config/slack.yml | ||
if: contains(toJson(github.event.commits.*.message), 'BREAKING CHANGE') | ||
|
||
# Step 12: Merge prod branch into main | ||
- name: Create PR to merge prod into main | ||
id: createpr | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
uses: actions/github-script@v6 | ||
with: | ||
script: | | ||
const ownerAndRepo = '${{ github.repository }}'; | ||
const [owner, repo] = ownerAndRepo.split('/'); | ||
const head = "prod"; | ||
const base = "main"; | ||
const title = "feat: Merge prod into main"; | ||
const pr = await github.rest.pulls.list({owner, repo, base, head: `${owner}:${head}`}) | ||
if (pr.data.length>0) { | ||
return pr.data[0].number; | ||
} | ||
const result = await github.rest.pulls.create({ | ||
owner, | ||
repo, | ||
head, | ||
base, | ||
title, | ||
}); | ||
return result.data.number; | ||
|
||
# Step 13: Automerge PR | ||
- name: Enable Automerge PR | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
uses: peter-evans/enable-pull-request-automerge@v3 | ||
with: | ||
pull-request-number: ${{steps.createpr.outputs.result}} | ||
merge-method: squash | ||
|
||
# Step 14: Generate token for autoapproving PR | ||
- name: Generate token | ||
id: generate_token | ||
uses: chanzuckerberg/[email protected] | ||
with: | ||
app_id: ${{ secrets.CZI_GITHUB_HELPER_APP_ID }} | ||
private_key: ${{ secrets.CZI_GITHUB_HELPER_PK }} | ||
|
||
# Step 15: Autoapprove PR | ||
- name: Autoapprove PR | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Oh 😯 |
||
run: gh pr review --approve "${{steps.createpr.outputs.result}}" | ||
env: | ||
GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }} | ||
|
||
# Job 2 | ||
create-version-matrix: | ||
needs: release | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Brilliant 🔥 !!! Thanks so much for auto merging the PR 🚀 💡 This is SO exciting!!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Incredible work, @alldoami! Thank you for your dedication and effort in putting this together. it's truly remarkable! 😍🥳🤩