Skip to content
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.

Sign up for GitHub

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 11 commits into from
Dec 5, 2023
Merged

feat: Add gha for merging prod into main #715

Changes from 2 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 Nov 29, 2023
291af22
comment
alldoami Nov 29, 2023
5877c93
add automerge functionality
alldoami Nov 29, 2023
a3aa1d6
new code that works
alldoami Nov 29, 2023
382a497
update title
alldoami Nov 29, 2023
b80c467
Merge branch 'main' into adoami/prod-into-main-action
alldoami Nov 29, 2023
52be6c0
semicolon
alldoami Nov 29, 2023
31f4faf
merge
alldoami Nov 29, 2023
d0078bc
Merge branch 'main' into adoami/prod-into-main-action
alldoami Nov 30, 2023
b627558
Merge branch 'main' into adoami/prod-into-main-action
masoudmanson Dec 5, 2023
39fb135
Merge branch 'main' into adoami/prod-into-main-action
masoudmanson Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,17 @@ jobs:
config: .github/config/slack.yml
if: contains(toJson(github.event.commits.*.message), 'BREAKING CHANGE')

# Step 12: Merge prod branch into main
- name: Merge prod into main
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
uses: peter-evans/create-pull-request@v4
with:
commit-message: merge prod into main
title: 'chore: merge prod into main'
base: main
branch: prod

# Job 2
create-version-matrix:
needs: release
Expand Down
Loading