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.

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

sync: master to stage #216

Merged
merged 2 commits into from
Apr 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 33 additions & 0 deletions .github/workflows/automerge.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: automerge
on:
pull_request:
branches:
- stage
- production
types:
- labeled
- unlabeled
- synchronize
- opened
- edited
- ready_for_review
- reopened
- unlocked
pull_request_review:
types:
- submitted
check_suite:
types:
- completed
status: {}
jobs:
automerge:
runs-on: ubuntu-latest
steps:
- id: automerge
name: automerge
uses: "pascalgn/automerge-action@v0.16.2"
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
MERGE_METHOD: merge
MERGE_FILTER_AUTHOR: github-actions
5 changes: 2 additions & 3 deletions .github/workflows/sync-prod-from-stage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ jobs:
uses: actions/checkout@v4
- name: Opening pull request
id: pull
# We need main for PULL_REQUEST_AUTO_MERGE_METHOD, which is currently not yet released.
uses: tretuna/sync-branches@main
uses: tretuna/sync-branches@1.4.0
with:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
FROM_BRANCH: "stage"
TO_BRANCH: "production"
PULL_REQUEST_AUTO_MERGE_METHOD: merge
LABELS: automerge
5 changes: 2 additions & 3 deletions .github/workflows/sync-stage-from-master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ jobs:
uses: actions/checkout@v4
- name: Opening pull request
id: pull
# We need main for PULL_REQUEST_AUTO_MERGE_METHOD, which is currently not yet released.
uses: tretuna/sync-branches@main
uses: tretuna/sync-branches@1.4.0
with:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
FROM_BRANCH: "master"
TO_BRANCH: "stage"
PULL_REQUEST_AUTO_MERGE_METHOD: merge
LABELS: automerge

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading