Merge pull request #364 from inteon/release_use_makefile_go_version

Use the go version specified in the Makefile tools module
cert-manager · May 29, 2024 · 517b7a4 · 517b7a4
2 parents dddde13 + bbde209
commit 517b7a4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/.github/workflows/debian-trust-package-release.yaml b/.github/workflows/debian-trust-package-release.yaml
@@ -17,6 +17,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - id: go-version
+        run: |
+          make print-go-version >> "$GITHUB_OUTPUT"
+
       - uses: docker/login-action@v3
         with:
           registry: quay.io
@@ -25,7 +29,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version-file: go.mod
+          go-version: ${{ steps.go-version.outputs.result }}
 
       - id: release
         run: make release-debian-trust-package

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -19,6 +19,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - id: go-version
+        run: |
+          make print-go-version >> "$GITHUB_OUTPUT"
+
       - uses: docker/login-action@v3
         with:
           registry: quay.io
@@ -27,15 +31,16 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version-file: go.mod
+          go-version: ${{ steps.go-version.outputs.result }}
 
       - id: release
         run: make release
 
       - uses: actions/upload-artifact@v4
         with:
-          name: trust-manager-${{ env.VERSION }}.tgz
+          name: ${{ steps.release.outputs.RELEASE_HELM_CHART_NAME }}-${{ steps.release.outputs.RELEASE_HELM_CHART_VERSION }}.tgz
           path: ${{ steps.release.outputs.RELEASE_HELM_CHART_TAR }}
+          if-no-files-found: error
 
     outputs:
       RELEASE_OCI_MANAGER_IMAGE: ${{ steps.release.outputs.RELEASE_OCI_MANAGER_IMAGE }}
@@ -67,18 +72,18 @@ jobs:
       - id: chart_download
         uses: actions/download-artifact@v4
         with:
-          name: trust-manager-${{ env.VERSION }}.tgz
+          name: ${{ needs.build_images.outputs.RELEASE_HELM_CHART_NAME }}-${{ needs.build_images.outputs.RELEASE_HELM_CHART_VERSION }}.tgz
 
       - env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh release create "$VERSION" \
             --repo="$GITHUB_REPOSITORY" \
-            --title="${GITHUB_REPOSITORY#*/} ${VERSION#v}" \
+            --title="${VERSION}" \
             --draft \
             --verify-tag \
             --notes-file .notes-file
           
           gh release upload "$VERSION" \
             --repo="$GITHUB_REPOSITORY" \
-            "${{ steps.chart_download.outputs.download-path }}/trust-manager-$VERSION.tgz"
+            "${{ steps.chart_download.outputs.download-path }}/${{ needs.build_images.outputs.RELEASE_HELM_CHART_NAME }}-${{ needs.build_images.outputs.RELEASE_HELM_CHART_VERSION }}.tgz"