Update sync-branches.yml

michalinacienciala · Oct 20, 2023 · 2e07d5a · 2e07d5a
1 parent 04336cc
commit 2e07d5a
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/.github/workflows/sync-branches.yml b/.github/workflows/sync-branches.yml
@@ -1,10 +1,8 @@
 name: Update staging and production environments
-
 on:
   push:
     branches:
       - stage-live
-
 jobs:
   sync-stage-live-to-stage-fork:
     if: github.ref == 'refs/heads/stage-live'
@@ -16,8 +14,13 @@ jobs:
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
         run: |
-          git pull --all
+          git log -n 5 --oneline > commit_history.txt
+          cat commit_history.txt
+          git checkout stage-live
+          git log -n 5 --oneline > commit_history_live.txt
+          cat commit_history_live.txt
           git checkout stage-fork
+          git log -n 5 --oneline > commit_history_fork.txt
+          cat commit_history_fork.txt
           git merge origin/stage-live
-          git push origin stage-fork
-  
+          git push orgin stage-fork