rebase in the right place

ecolabdata · Nov 13, 2024 · 59bb0ab · 59bb0ab
1 parent 026c97f
commit 59bb0ab
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/update-universes.yml b/.github/workflows/update-universes.yml
@@ -37,12 +37,12 @@ jobs:
       run: |
         git config --local user.email "[email protected]"
         git config --local user.name "GitHub Action"
-        git pull --rebase origin ${{ github.ref_name }}
         git add logs/run_log_demo.txt
         git commit -m "Update daily run log for demo"
 
     - name: Push changes
       run: |
+        git pull --rebase origin ${{ github.ref_name }}
         git push
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -75,12 +75,12 @@ jobs:
       run: |
         git config --local user.email "[email protected]"
         git config --local user.name "GitHub Action"
-        git pull --rebase origin ${{ github.ref_name }}
         git add logs/run_log_prod.txt
         git commit -m "Update daily run log for prod"
 
     - name: Push changes
       run: |
+        git pull --rebase origin ${{ github.ref_name }}
         git push
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}