Merge pull request #236 from stackrox/master

sync: master to stage
stackrox · May 2, 2024 · 2b7d9ec · 2b7d9ec
2 parents 38ac0da + 81f5c6f
commit 2b7d9ec
Show file tree

Hide file tree

Showing 14 changed files with 883 additions and 60 deletions.
diff --git a/.github/workflows/sync-prod-from-stage.yaml b/.github/workflows/sync-prod-from-stage.yaml
@@ -10,9 +10,10 @@ jobs:
         uses: actions/checkout@v4
       - name: Opening pull request
         id: pull
-        uses: tretuna/[email protected]
+        # Need master for LABELS option.
+        uses: tretuna/sync-branches@master
         with:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
           FROM_BRANCH: "stage"
           TO_BRANCH: "production"
-          LABELS: automerge
+          LABELS: '["automerge"]'
diff --git a/.github/workflows/sync-stage-from-master.yaml b/.github/workflows/sync-stage-from-master.yaml
@@ -10,9 +10,10 @@ jobs:
         uses: actions/checkout@v4
       - name: Opening pull request
         id: pull
-        uses: tretuna/[email protected]
+        # Need master for LABELS option.
+        uses: tretuna/sync-branches@master
         with:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
           FROM_BRANCH: "master"
           TO_BRANCH: "stage"
-          LABELS: automerge
+          LABELS: '["automerge"]'