Merge pull request #40 from catenax-ng/feature/TRI-854-fix-branch-syn…

…c-action feat(workflows):[TRI-854] Add fetch origin
eclipse-tractusx · Nov 29, 2022 · 1124289 · 1124289
2 parents 9cd8390 + 1bfd738
commit 1124289
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/.github/workflows/synch-env-branch.yml b/.github/workflows/synch-env-branch.yml
@@ -2,7 +2,8 @@ name: "Sync main to IRS-Env"
 
 on:
   push:
-    branches: main
+    branches:
+      - main
 
 jobs:
   sync-branches:
@@ -19,7 +20,8 @@ jobs:
         run: |
           git config user.name github-actions
           git config user.email [email protected]
-          git merge origin/main
+          git fetch origin
+          git merge origin/main -m "Merge remote-tracking branch 'origin/main' into helm-environments" --allow-unrelated-histories
           git push
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}