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 #261

Merged
merged 1 commit into from
Jul 1, 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
2 changes: 1 addition & 1 deletion .github/workflows/automerge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ jobs:
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
MERGE_METHOD: merge
MERGE_FILTER_AUTHOR: github-actions
MERGE_FILTER_AUTHOR: github-actions[bot]
13 changes: 11 additions & 2 deletions .github/workflows/sync-prod-from-stage.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,28 @@
name: Sync stage -> production
on:
workflow_dispatch:
permissions:
# Needed to read branches.
contents: read
# Needed to create PR's.
pull-requests: write
jobs:
sync-branches:
runs-on: ubuntu-latest
name: Syncing branches
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version: 20
- name: Opening pull request
id: pull
# Need master for LABELS option.
uses: tretuna/sync-branches@master
uses: jdtx0/[email protected]
with:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
FROM_BRANCH: "stage"
TO_BRANCH: "production"
LABELS: '["automerge"]'
PULL_REQUEST_AUTO_MERGE_METHOD: "merge"
13 changes: 11 additions & 2 deletions .github/workflows/sync-stage-from-master.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,28 @@
name: Sync master -> stage
on:
workflow_dispatch:
permissions:
# Needed to read branches.
contents: read
# Needed to create PR's.
pull-requests: write
jobs:
sync-branches:
runs-on: ubuntu-latest
name: Syncing branches
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version: 20
- name: Opening pull request
id: pull
# Need master for LABELS option.
uses: tretuna/sync-branches@master
uses: jdtx0/[email protected]
with:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
FROM_BRANCH: "master"
TO_BRANCH: "stage"
LABELS: '["automerge"]'
PULL_REQUEST_AUTO_MERGE_METHOD: "merge"
Loading