Merge branch 'main' into refactor-global-constants

kyma-project · Dec 13, 2024 · cf970b8 · cf970b8
2 parents 73e40c3 + 6d56272
commit cf970b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/pr-integration.yml b/.github/workflows/pr-integration.yml
@@ -1,7 +1,8 @@
 name: PR Integration
 
 env:
-  IMG: europe-docker.pkg.dev/kyma-project/dev/telemetry-manager:PR-${{ github.event.number }}
+  # add the tag PR-<number> to the image if it is a PR, if the trigger is merge_group, then add the sha as the tag
+  IMG: europe-docker.pkg.dev/kyma-project/dev/telemetry-manager:${{ github.event_name == 'pull_request' && 'PR-' || '' }}${{ github.event.number || github.event.merge_group.head_sha }}
 
 on:
   merge_group:

diff --git a/.github/workflows/pr-lifecycle.yml b/.github/workflows/pr-lifecycle.yml
@@ -70,7 +70,9 @@ jobs:
       - name: Deploy with current version
         shell: bash
         run: |
-          IMG=europe-docker.pkg.dev/kyma-project/dev/telemetry-manager:PR-${{ github.event.number }} make deploy-dev
+          # add the tag PR-<number> to the image if it is a PR, if the trigger is merge_group, then add the sha as the tag
+          TAG="${{ github.event_name == 'pull_request' && 'PR-' || '' }}${{ github.event.number || github.event.merge_group.head_sha }}"
+          IMG=europe-docker.pkg.dev/kyma-project/dev/telemetry-manager:${TAG} make deploy-dev
 
       - name: Wait for manager readiness
         shell: bash