From f26ec8f6184067eeea38cb602777e695b0ac429f Mon Sep 17 00:00:00 2001 From: Shwetabh Kumar Date: Thu, 12 Oct 2023 13:45:32 +0530 Subject: [PATCH 1/2] Pulling master before pushing new commit --- .github/workflows/staging_deployment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/staging_deployment.yml b/.github/workflows/staging_deployment.yml index ebcccdaf..83bb2fdc 100644 --- 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 From e08a2f7207581ae5b273b89d36e1aac70373ac09 Mon Sep 17 00:00:00 2001 From: Shwetabh Kumar Date: Thu, 12 Oct 2023 13:53:33 +0530 Subject: [PATCH 2/2] doing same for prod --- .github/workflows/production_deployment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/production_deployment.yml b/.github/workflows/production_deployment.yml index 394d6328..31fe6604 100644 --- 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: