From 3214d957dd73cde8a81883418cc44f8c4ff8866c Mon Sep 17 00:00:00 2001 From: Hauke Sonnenberg Date: Thu, 24 Jul 2025 19:41:56 +0200 Subject: [PATCH 1/3] Use cut to get short SHA --- .github/workflows/deploy.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 93e85cc..0948138 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -12,12 +12,10 @@ jobs: runs-on: ubuntu-latest environment: ${{ inputs.environment }} steps: - - name: Checkout repository - uses: actions/checkout@v2 - name: Declare image's tag shell: bash run: | - echo "sha_short=$(git rev-parse --short "$GITHUB_SHA")" >> "$GITHUB_ENV" + echo "sha_short=$(echo $GITHUB_SHA | cut -c 1-8)" >> "$GITHUB_ENV" - name: Deploy uses: appleboy/ssh-action@v1.1.0 env: @@ -31,4 +29,4 @@ jobs: cd ${{ secrets.DEPLOY_PATH }} && git pull microk8s ctr image import img.tar && rm img.tar cd infra/helm - microk8s helm upgrade -f ./qmra/${{ inputs.environment }}.values.yaml qmra ./qmra -n qmra --set app_secret_key.value=${{ secrets.APP_SECRET_KEY }},image.tag="$sha_short" \ No newline at end of file + microk8s helm upgrade -f ./qmra/${{ inputs.environment }}.values.yaml qmra ./qmra -n qmra --set app_secret_key.value=${{ secrets.APP_SECRET_KEY }},image.tag="$sha_short" From 352fd4111cbf9beeab35cc65bbb96609cb072917 Mon Sep 17 00:00:00 2001 From: Hauke Sonnenberg Date: Thu, 24 Jul 2025 19:43:59 +0200 Subject: [PATCH 2/3] remove double quotes --- .github/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 0948138..e402b25 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -15,7 +15,7 @@ jobs: - name: Declare image's tag shell: bash run: | - echo "sha_short=$(echo $GITHUB_SHA | cut -c 1-8)" >> "$GITHUB_ENV" + echo "sha_short=$(echo $GITHUB_SHA | cut -c 1-8)" >> $GITHUB_ENV - name: Deploy uses: appleboy/ssh-action@v1.1.0 env: From f2f38603a93814b7998107ea0713d6c75118151b Mon Sep 17 00:00:00 2001 From: Hauke Sonnenberg Date: Thu, 24 Jul 2025 20:20:26 +0200 Subject: [PATCH 3/3] Should work without extra "env" declaration --- .github/workflows/deploy.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index e402b25..b9eb84d 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -18,8 +18,6 @@ jobs: echo "sha_short=$(echo $GITHUB_SHA | cut -c 1-8)" >> $GITHUB_ENV - name: Deploy uses: appleboy/ssh-action@v1.1.0 - env: - sha_short: ${{ env.sha_short }} with: host: ${{ secrets.DEPLOY_HOST }} username: ${{ secrets.DEPLOY_USER }}