test merge

IntersectMBO · Aug 2, 2024 · b3c266a · b3c266a
1 parent 7a4d19d
commit b3c266a
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml
@@ -17,6 +17,7 @@ env:
   ENVIRONMENT: ${{ github.ref_name == 'main' && 'production' || 'pre-prod' || 'qa' || 'dev' }}
   PROJECT: ""
   ORGANIZATION: ""
+  TAG: "${{ github.ref_name == 'main' ? github.sha : github.ref_name + '-' + github.sha }}"
 
 jobs:
   check-build-deploy:
@@ -94,7 +95,7 @@ jobs:
         with:
           context: ${{ matrix.workdir }}
           file: ${{ matrix.dockerfile }}
-          tags: ${{ steps.image_lowercase.outputs.lowercase }}:${{ github.sha }}
+          tags: ${{ steps.image_lowercase.outputs.lowercase }}:${{ env.TAG }}
           load: true
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
@@ -113,7 +114,7 @@ jobs:
             tar zxvf dockle_0.4.14_Linux-64bit.tar.gz
             sudo mv dockle /usr/local/bin
 
-            dockle --exit-level fatal --format json --output ${{ matrix.workdir }}/dockle_scan_output.json ${{ steps.image_lowercase.outputs.lowercase }}:${{ github.sha }}
+            dockle --exit-level fatal --format json --output ${{ matrix.workdir }}/dockle_scan_output.json ${{ steps.image_lowercase.outputs.lowercase }}:${{ env.TAG }}
             echo " dockle exited w/ $?"
             cat ${{ matrix.workdir }}/dockle_scan_output.json
 
@@ -123,7 +124,7 @@ jobs:
 
       - name: Push Docker image to GHCR
         run: |
-          docker push ${{ steps.image_lowercase.outputs.lowercase }}:${{ github.sha }}
+          docker push ${{ steps.image_lowercase.outputs.lowercase }}:${{ env.TAG }}
 
       - name: Deploy with Qovery
         env:
@@ -139,5 +140,5 @@ jobs:
             --project ${{ env.PROJECT }} \
             --environment ${{ env.ENVIRONMENT }} \
             --container ${{ steps.image_lowercase.outputs.lowercase }} \
-            --tag ${{ github.sha }} \
+            --tag :${{ env.TAG }} \
             --watch