Merge pull request #39 from leanix/feature/CID-3008/Publish-Image-to-…

…OSS-Store-Docker-registry CID-3008: running release drafter and tag next version of merge to ma…
leanix · Nov 12, 2024 · f2c551e · f2c551e
2 parents c9731b9 + 0da8392
commit f2c551e
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 33 deletions.
diff --git a/.github/workflows/publish-dev-docker-image.yml b/.github/workflows/publish-dev-docker-image.yml
@@ -26,6 +26,39 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Tag next version
+        id: tag-action
+        uses: K-Phoen/semver-release-action@master
+        with:
+          release_branch: main
+          release_strategy: tag
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Publish Release Draft
+        uses: actions/[email protected]
+        if: (steps.tag-action.outputs.tag != '')
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            const tag = "${{ steps.tag-action.outputs.tag }}";
+            const { data: releases } = await github.rest.repos.listReleases({
+              owner: context.repo.owner,
+              repo: context.repo.repo
+            });
+            const draftRelease = releases.find(release => release.tag_name === tag && release.draft === true);
+            if (!draftRelease) {
+              console.log(`No draft release found for tag ${tag}`);
+              return;
+            }
+            await github.rest.repos.updateRelease({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              release_id: draftRelease.id,
+              draft: false
+            });
+            console.log(`Published draft release for tag ${tag}`);   
+
       - name: Setup Java
         uses: actions/setup-java@v3
         with:

diff --git a/.github/workflows/publish-package-to-ghcr.yml b/.github/workflows/publish-package-to-ghcr.yml
@@ -22,38 +22,13 @@ jobs:
     environment: ghcr:leanix-github-agent
 
     steps:
-      - name: Tag next version
-        id: tag-action
-        uses: K-Phoen/semver-release-action@master
-        with:
-          release_branch: main
-          release_strategy: tag
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Publish Release Draft
-        uses: actions/[email protected]
-        if: (steps.tag-action.outputs.tag != '')
-        with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          script: |
-            const tag = "${{ steps.tag-action.outputs.tag }}";
-            const { data: releases } = await github.rest.repos.listReleases({
-              owner: context.repo.owner,
-              repo: context.repo.repo
-            });
-            const draftRelease = releases.find(release => release.tag_name === tag && release.draft === true);
-            if (!draftRelease) {
-              console.log(`No draft release found for tag ${tag}`);
-              return;
-            }
-            await github.rest.repos.updateRelease({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              release_id: draftRelease.id,
-              draft: false
-            });
-            console.log(`Published draft release for tag ${tag}`);     
+      - name: Extract Docker image tag
+        id: extract_tag
+        run: |
+          TAG=${GITHUB_REF#refs/tags/}
+          CLEAN_TAG=${TAG//[^0-9.]/}
+          echo "Docker image tag: ${CLEAN_TAG}"
+          echo "::set-output name=tag::${CLEAN_TAG}"
 
       - name: Checkout
         uses: actions/checkout@v3
@@ -92,7 +67,7 @@ jobs:
         with:
           context: .
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.tag-action.outputs.tag }}
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.extract_tag.outputs.tag }}
           labels: ${{ steps.meta.outputs.labels }}
 
       - name: Generate artifact attestation