From 228706cc83b87dc95a7d435db3a3cacdd215ad19 Mon Sep 17 00:00:00 2001 From: Shwetabh Kumar Date: Thu, 12 Oct 2023 14:13:05 +0530 Subject: [PATCH] Pulling master before pushing new commit --- .github/workflows/production_deployment.yml | 1 + .github/workflows/staging_deployment.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/production_deployment.yml b/.github/workflows/production_deployment.yml index 92fe036..519aa9e 100644 --- a/.github/workflows/production_deployment.yml +++ b/.github/workflows/production_deployment.yml @@ -47,6 +47,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 index 168724e..b57e1d7 100644 --- a/.github/workflows/staging_deployment.yml +++ b/.github/workflows/staging_deployment.yml @@ -50,6 +50,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