Skip to content

Commit

Permalink
Merge pull request #217 from stackrox/stage
Browse files Browse the repository at this point in the history
sync: stage to production
  • Loading branch information
stehessel authored Apr 12, 2024
2 parents 63523e6 + 76f9e9d commit 103c8ee
Show file tree
Hide file tree
Showing 13 changed files with 67 additions and 230 deletions.
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

0 comments on commit 103c8ee

Please sign in to comment.