diff --git a/.github/workflows/staging-deployment.yaml b/.github/workflows/staging-deployment.yaml index 257b875f72..c655d69df2 100644 --- a/.github/workflows/staging-deployment.yaml +++ b/.github/workflows/staging-deployment.yaml @@ -13,24 +13,25 @@ jobs: - name: Executing remote ssh commands using ssh key uses: appleboy/ssh-action@v0.1.6 env: - DOCKER_TAG: develop + GITHUB_BRANCH: develop GITHUB_SHA: ${{ github.sha }} with: host: ${{ secrets.HOST_DNS }} username: ${{ secrets.USERNAME }} key: ${{ secrets.EC2_SSH_KEY }} - envs: DOCKER_TAG,GITHUB_SHA + envs: GITHUB_BRANCH,GITHUB_SHA command_timeout: 60m script: | - echo "DOCKER_TAG: ${DOCKER_TAG}" + echo "GITHUB_BRANCH: ${GITHUB_BRANCH}" echo "GITHUB_SHA: ${GITHUB_SHA}" + export DOCKER_TAG="${GITHUB_SHA:0:7}" # needed for child process to access it docker system prune --force cd ~/signoz git status git add . git stash push -m "stashed on $(date --iso-8601=seconds)" git fetch origin - git checkout develop + git checkout ${GITHUB_BRANCH} git pull make build-ee-query-service-amd64 make build-frontend-amd64 diff --git a/.github/workflows/testing-deployment.yaml b/.github/workflows/testing-deployment.yaml index 4377520134..d122291d42 100644 --- a/.github/workflows/testing-deployment.yaml +++ b/.github/workflows/testing-deployment.yaml @@ -15,17 +15,17 @@ jobs: env: GITHUB_BRANCH: ${{ github.head_ref || github.ref_name }} GITHUB_SHA: ${{ github.sha }} - DEV_BUILD: "1" with: host: ${{ secrets.HOST_DNS }} username: ${{ secrets.USERNAME }} key: ${{ secrets.EC2_SSH_KEY }} - envs: GITHUB_BRANCH,GITHUB_SHA,DEV_BUILD + envs: GITHUB_BRANCH,GITHUB_SHA command_timeout: 60m script: | echo "GITHUB_BRANCH: ${GITHUB_BRANCH}" echo "GITHUB_SHA: ${GITHUB_SHA}" export DOCKER_TAG="${GITHUB_SHA:0:7}" # needed for child process to access it + export DEV_BUILD="1" docker system prune --force cd ~/signoz git status