Merge pull request #198 from adobecom/stage

[Release] Stage to Main

.github/workflows/auto-merge-main-to-stage.yml

@@ -0,0 +1,23 @@
+name: PRs to main
+on: 
+  pull_request:
+    branches: [main]
+    types: [closed]
+jobs:
+  merge-main-to-stage:
+    if: github.event.pull_request.merged == true
+    timeout-minutes: 2
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set Git config
+      run: |
+          git config user.email "github-actions@github.com"
+          git config user.name "github-actions"
+    - name: Merge main to stage
+      run: |
+          git fetch
+          git checkout stage
+          git pull
+          git merge --no-ff main -m "Auto-merge main to stage"
+          git push

.github/workflows/graybox-sync-repos.yml

@@ -45,7 +45,7 @@ jobs:
 
       - name: Overwrite graybox repo files with latest from source repo
         run: |
-          rsync -av --exclude='fstab.yaml' --exclude='.github' --exclude='.git' --exclude='.idea' --exclude='.husky' --exclude='.vscode' --exclude='tools/sidekick/config.json' ./ ../bacom-graybox/
+          rsync -av --exclude='fstab.yaml' --exclude='.github' --exclude='.kodiak' --exclude='.git' --exclude='.idea' --exclude='.husky' --exclude='.vscode' --exclude='tools/sidekick/config.json' ./ ../bacom-graybox/
 
       - name: Commit and Push Changes to Graybox Repository
         run: |