Skip to content

Commit 3dbeb6c

Browse files
committed
use the go version specified in the Makefile tools module
Signed-off-by: Tim Ramlot <[email protected]>
1 parent 4323445 commit 3dbeb6c

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

.github/workflows/debian-trust-package-release.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v4
1919

20+
- id: go-version
21+
run: |
22+
make print-go-version >> "$GITHUB_OUTPUT"
23+
2024
- uses: docker/login-action@v3
2125
with:
2226
registry: quay.io
@@ -25,7 +29,7 @@ jobs:
2529

2630
- uses: actions/setup-go@v5
2731
with:
28-
go-version-file: go.mod
32+
go-version: ${{ steps.go-version.outputs.result }}
2933

3034
- id: release
3135
run: make release-debian-trust-package

.github/workflows/release.yaml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v4
2121

22+
- id: go-version
23+
run: |
24+
make print-go-version >> "$GITHUB_OUTPUT"
25+
2226
- uses: docker/login-action@v3
2327
with:
2428
registry: quay.io
@@ -27,15 +31,16 @@ jobs:
2731

2832
- uses: actions/setup-go@v5
2933
with:
30-
go-version-file: go.mod
34+
go-version: ${{ steps.go-version.outputs.result }}
3135

3236
- id: release
3337
run: make release
3438

3539
- uses: actions/upload-artifact@v4
3640
with:
37-
name: trust-manager-${{ env.VERSION }}.tgz
41+
name: ${{ steps.release.outputs.RELEASE_HELM_CHART_NAME }}-${{ steps.release.outputs.RELEASE_HELM_CHART_VERSION }}.tgz
3842
path: ${{ steps.release.outputs.RELEASE_HELM_CHART_TAR }}
43+
if-no-files-found: error
3944

4045
outputs:
4146
RELEASE_OCI_MANAGER_IMAGE: ${{ steps.release.outputs.RELEASE_OCI_MANAGER_IMAGE }}
@@ -67,18 +72,18 @@ jobs:
6772
- id: chart_download
6873
uses: actions/download-artifact@v4
6974
with:
70-
name: trust-manager-${{ env.VERSION }}.tgz
75+
name: ${{ needs.build_images.outputs.RELEASE_HELM_CHART_NAME }}-${{ needs.build_images.outputs.RELEASE_HELM_CHART_VERSION }}.tgz
7176

7277
- env:
7378
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7479
run: |
7580
gh release create "$VERSION" \
7681
--repo="$GITHUB_REPOSITORY" \
77-
--title="${GITHUB_REPOSITORY#*/} ${VERSION#v}" \
82+
--title="${VERSION}" \
7883
--draft \
7984
--verify-tag \
8085
--notes-file .notes-file
8186
8287
gh release upload "$VERSION" \
8388
--repo="$GITHUB_REPOSITORY" \
84-
"${{ steps.chart_download.outputs.download-path }}/trust-manager-$VERSION.tgz"
89+
"${{ steps.chart_download.outputs.download-path }}/${{ needs.build_images.outputs.RELEASE_HELM_CHART_NAME }}-${{ needs.build_images.outputs.RELEASE_HELM_CHART_VERSION }}.tgz"

0 commit comments

Comments
 (0)