From 56b71d0f0237a0bf4205e318e45ea1927c873553 Mon Sep 17 00:00:00 2001 From: Prashant Shahi Date: Tue, 6 Feb 2024 16:49:23 +0530 Subject: [PATCH] ci(testing-deploy): update workflow to handle force-push scenerio (#4503) Signed-off-by: Prashant Shahi --- .github/workflows/testing-deployment.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/testing-deployment.yaml b/.github/workflows/testing-deployment.yaml index 6938f5ce78..efb3d58a79 100644 --- a/.github/workflows/testing-deployment.yaml +++ b/.github/workflows/testing-deployment.yaml @@ -33,8 +33,11 @@ jobs: git add . git stash push -m "stashed on $(date --iso-8601=seconds)" git fetch origin - git checkout ${GITHUB_BRANCH} + git checkout develop git pull + # This is added to include the scenerio when new commit in PR is force-pushed + git branch -D ${GITHUB_BRANCH} + git checkout --track origin/${GITHUB_BRANCH} make build-ee-query-service-amd64 make build-frontend-amd64 make run-signoz \ No newline at end of file