From fc87a390ba352f98a327e630adca8619f64c9423 Mon Sep 17 00:00:00 2001
From: Dustin Jenkins <djenkins.cadc@gmail.com>
Date: Fri, 22 Nov 2024 21:14:28 +0000
Subject: [PATCH] ci: review rework for ci cd

---
 .github/workflows/cd.edge.build.yml    |  2 +-
 .github/workflows/cd.release.build.yml | 12 +-----------
 .github/workflows/cd.release.yml       |  3 ---
 release-please-config.json             |  2 +-
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/cd.edge.build.yml b/.github/workflows/cd.edge.build.yml
index 8f95e62..091a4af 100644
--- a/.github/workflows/cd.edge.build.yml
+++ b/.github/workflows/cd.edge.build.yml
@@ -77,4 +77,4 @@ jobs:
         id: cosign
         run: |
           cosign version
-          cosign sign --yes ${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ env.TAG }} --upload
+          cosign sign --yes ${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ steps.build.outputs.digest }} --upload
diff --git a/.github/workflows/cd.release.build.yml b/.github/workflows/cd.release.build.yml
index aa22591..4a73beb 100644
--- a/.github/workflows/cd.release.build.yml
+++ b/.github/workflows/cd.release.build.yml
@@ -38,14 +38,6 @@ jobs:
           registry: images.opencadc.org
           username: ${{ secrets.REGISTRY_USERNAME }}
           password: ${{ secrets.REGISTRY_TOKEN }}
-      -
-        name: Sanitize Release Tag
-        id: sanitize-tag
-        run: |
-          echo "Sanitizing Tag: ${{ env.TAG_RELEASE }}"
-          export SANITIZED_TAG_RELEASE=$(echo ${{ env.TAG_RELEASE }} | sed 's/^v//'
-          echo "Sanitized Tag: $SANITIZED_TAG_RELEASE"
-          echo SANITIZED_TAG_RELEASE=$SANITIZED_TAG_RELEASE >> $GITHUB_ENV
       -
         name: Build and Push Docker Image
         id: build
@@ -62,7 +54,7 @@ jobs:
           tags: |
             ${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ env.TAG }}
             ${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ env.TAG_RELEASE }}
-            ${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ env.SANITIZED_TAG_RELEASE }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE }}:v${{ env.TAG_RELEASE }}
           labels: |
             org.opencontainers.image.title=Science Portal
             org.opencontainers.image.version=${{ env.TAG_RELEASE }}
@@ -92,6 +84,4 @@ jobs:
         id: cosign
         run: |
           cosign version
-          cosign sign --yes ${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ env.TAG }} --upload
-          cosign sign --yes ${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ env.TAG_RELEASE }} --upload
           cosign sign --yes ${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ steps.build.outputs.digest }} --upload
diff --git a/.github/workflows/cd.release.yml b/.github/workflows/cd.release.yml
index e54e8ae..7d717c9 100644
--- a/.github/workflows/cd.release.yml
+++ b/.github/workflows/cd.release.yml
@@ -5,9 +5,6 @@ on:
   push:
     branches:
       - main
-  pull_request:
-    branches:
-      - main
 
 jobs:
   release-please:
diff --git a/release-please-config.json b/release-please-config.json
index d2823ba..0c03aae 100644
--- a/release-please-config.json
+++ b/release-please-config.json
@@ -9,7 +9,7 @@
         "draft": false,
         "prerelease": false,
         "include-component-in-tag": false,
-        "include-v-in-tag": true,
+        "include-v-in-tag": false,
         "extra-files": [
           "gradle.properties"
         ]