Merge branch 'master' into onboarding-state

fylein · Oct 13, 2023 · c64ff14 · c64ff14
2 parents ec4f4d1 + 2f5f4e0
commit c64ff14
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
@@ -47,6 +47,7 @@ jobs:
           git add .
           git commit -m "Update netsuite-api 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
         env:

diff --git a/.github/workflows/staging_deployment.yml b/.github/workflows/staging_deployment.yml
@@ -51,6 +51,7 @@ jobs:
           git add .
           git commit -m "Update netsuite-api 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