Pulling master before pushing new commit (#499)

fylein · Oct 12, 2023 · 7bd1d70 · 7bd1d70
1 parent 0571d24
commit 7bd1d70
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.github/workflows/production_deployment.yml b/.github/workflows/production_deployment.yml
@@ -61,6 +61,7 @@ jobs:
           git add .
           git commit -m "Update image tag"
           git remote set-url origin https://x-access-token:${{ secrets.DEPLOY_GIT_ACCESS_TOKEN }}@github.com/${{ secrets.PROD_DEPLOY_REPO }}
+          git pull origin master
           git push origin master
 
       - name: Create new Sentry release

diff --git a/.github/workflows/staging_deployment.yml b/.github/workflows/staging_deployment.yml
@@ -49,6 +49,7 @@ jobs:
           git add .
           git commit -m "Update image tag"
           git remote set-url origin https://x-access-token:${{ secrets.DEPLOY_GIT_ACCESS_TOKEN }}@github.com/${{ secrets.STAGING_DEPLOY_REPO }}
+          git pull origin master
           git push origin master
 
       - name: Create new Sentry release