Skip to content

Commit

Permalink
build(mk): use go.mod as source of truth for go version in makefiles …
Browse files Browse the repository at this point in the history
…(backport of #7843) (#7861)

* build(mk): use go.mod as source of truth for go version in makefiles (#7843)

* build(mk): use go.mod as source of truth for go version
* ci: use go-version-file in github actions
* ci: don't check go version with actions/setup-go

* build(mk): resolve conflicts
* build(mk): generate lock

Signed-off-by: Mike Beaumont <[email protected]>
Signed-off-by: Lukasz Dziedziak <[email protected]>
Co-authored-by: Mike Beaumont <[email protected]>
Co-authored-by: Lukasz Dziedziak <[email protected]>
  • Loading branch information
3 people authored Sep 26, 2023
1 parent de5c007 commit d173e7b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/helm-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-go@v4
with:
go-version: "1.21.1"
go-version-file: go.mod
- name: Install dependencies
run: |
curl -L "https://github.com/helm/chart-releaser/releases/download/v${CR_VERSION}/chart-releaser_${CR_VERSION}_linux_amd64.tar.gz" | sudo tar xvz --directory /usr/bin cr
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-comments.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
GITHUB_TOKEN: ${{ steps.github-app-token.outputs.token }}
- uses: actions/setup-go@v3
with:
go-version: "1.21.1"
go-version-file: go.mod
- uses: actions/cache@v3
with:
path: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/update-changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ jobs:
with:
ref: "master"
- uses: actions/setup-go@v3
with:
go-version-file: go.mod
- env:
GITHUB_TOKEN: ${{ steps.github-app-token.outputs.token }}
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-insecure-dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
ref: ${{ matrix.branch }}
- uses: actions/setup-go@v3
with:
go-version: "~1.21.1"
go-version-file: go.mod
- name: "Install tools"
run: |
go install github.com/google/osv-scanner/cmd/osv-scanner@v1
Expand Down

0 comments on commit d173e7b

Please sign in to comment.