From b1000ba5d76c6c8e7813235647767a49b4552255 Mon Sep 17 00:00:00 2001 From: dongjiang Date: Mon, 17 Mar 2025 20:01:28 +0800 Subject: [PATCH 1/6] update golang to v1.24 Signed-off-by: dongjiang --- .github/env | 1 + .github/workflows/build-test.yml | 2 +- .github/workflows/golangci-lint.yml | 4 ++-- .github/workflows/govulncheck.yml | 2 +- .github/workflows/release.yml | 4 ++-- go.mod | 2 +- go.sum | 2 -- 7 files changed, 8 insertions(+), 9 deletions(-) create mode 100644 .github/env diff --git a/.github/env b/.github/env new file mode 100644 index 000000000..75679dfda --- /dev/null +++ b/.github/env @@ -0,0 +1 @@ +golang-version=1.24 diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 2ccea3d0e..99ded76dd 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -22,7 +22,7 @@ jobs: - name: Setup Go uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # pin@5.3.0 with: - go-version: '1.23' + go-version: '${{ env.golang-version }}' check-latest: true - name: Test source headers are present run: make test-source-headers diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index d7eafdd72..87b09be2d 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -18,9 +18,9 @@ jobs: - name: Setup Go uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # pin@5.3.0 with: - go-version: '1.23' + go-version: '${{ env.golang-version }}' check-latest: true - name: golangci-lint uses: golangci/golangci-lint-action@4696ba8babb6127d732c3c6dde519db15edab9ea #pin@6.5.1 with: - version: v1.62 + version: v1.64 diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml index f8572f2d6..c86c5f562 100644 --- a/.github/workflows/govulncheck.yml +++ b/.github/workflows/govulncheck.yml @@ -16,7 +16,7 @@ jobs: - name: Setup Go uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # pin@5.3.0 with: - go-version: '1.23' + go-version: '${{ env.golang-version }}' check-latest: true - name: govulncheck uses: golang/govulncheck-action@b625fbe08f3bccbe446d94fbf87fcc875a4f50ee # pin@1.0.4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c5e7c6840..0a11d520d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,7 +27,7 @@ jobs: - name: Setup Go uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # pin@5.3.0 with: - go-version: '1.23' + go-version: '${{ env.golang-version }}' - name: Run unit tests run: make test-coverage @@ -83,7 +83,7 @@ jobs: - name: Setup Go uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # pin@5.3.0 with: - go-version: '1.23' + go-version: '${{ env.golang-version }}' check-latest: true - name: Run unit tests diff --git a/go.mod b/go.mod index 789cc723f..e833dfa20 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module helm.sh/helm/v4 -go 1.23.0 +go 1.24.0 require ( github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 diff --git a/go.sum b/go.sum index fec96dac6..1d112b64a 100644 --- a/go.sum +++ b/go.sum @@ -423,8 +423,6 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c= golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= From 068a892d27fe3f705b7d8dba7822f77b7c87135e Mon Sep 17 00:00:00 2001 From: dongjiang Date: Tue, 18 Mar 2025 13:55:40 +0800 Subject: [PATCH 2/6] fix codereview bug Signed-off-by: dongjiang --- .github/workflows/build-test.yml | 2 ++ .github/workflows/golangci-lint.yml | 3 ++- .github/workflows/govulncheck.yml | 2 ++ .github/workflows/release.yml | 8 ++++++-- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 99ded76dd..330b70aea 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -19,6 +19,8 @@ jobs: steps: - name: Checkout source code uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pin@v4.2.2 + - name: Import environment variables from file + run: cat ".github/env" >> "$GITHUB_ENV" - name: Setup Go uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # pin@5.3.0 with: diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 87b09be2d..35bd15976 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -14,7 +14,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pin@v4.2.2 - + - name: Import environment variables from file + run: cat ".github/env" >> "$GITHUB_ENV" - name: Setup Go uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # pin@5.3.0 with: diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml index c86c5f562..d7505504b 100644 --- a/.github/workflows/govulncheck.yml +++ b/.github/workflows/govulncheck.yml @@ -13,6 +13,8 @@ jobs: name: govulncheck runs-on: ubuntu-latest steps: + - name: Import environment variables from file + run: cat ".github/env" >> "$GITHUB_ENV" - name: Setup Go uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # pin@5.3.0 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0a11d520d..c0a72ddc5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,14 +24,15 @@ jobs: with: fetch-depth: 0 + - name: Import environment variables from file + run: cat ".github/env" >> "$GITHUB_ENV" + - name: Setup Go uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # pin@5.3.0 with: go-version: '${{ env.golang-version }}' - - name: Run unit tests run: make test-coverage - - name: Build Helm Binaries run: | set -eu -o pipefail @@ -80,6 +81,9 @@ jobs: - name: Checkout source code uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pin@v4.2.2 + - name: Import environment variables from file + run: cat ".github/env" >> "$GITHUB_ENV" + - name: Setup Go uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # pin@5.3.0 with: From af5f730a162ad6334c9b1fadd862e8f96a110c38 Mon Sep 17 00:00:00 2001 From: dongjiang Date: Tue, 18 Mar 2025 15:10:00 +0800 Subject: [PATCH 3/6] add golangci-lint-version Signed-off-by: dongjiang --- .github/env | 1 + .github/workflows/golangci-lint.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/env b/.github/env index 75679dfda..5d432ef0d 100644 --- a/.github/env +++ b/.github/env @@ -1 +1,2 @@ golang-version=1.24 +golangci-lint-version=v1.64 diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 35bd15976..649e0f693 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -24,4 +24,4 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@4696ba8babb6127d732c3c6dde519db15edab9ea #pin@6.5.1 with: - version: v1.64 + version: ${{ env.golangci-lint-version }} From f8e85bf172768cc1011e77586c1591750d3103ce Mon Sep 17 00:00:00 2001 From: dongjiang Date: Wed, 19 Mar 2025 09:39:48 +0800 Subject: [PATCH 4/6] change environment varialbe names Signed-off-by: dongjiang --- .github/env | 4 ++-- .github/workflows/build-test.yml | 2 +- .github/workflows/golangci-lint.yml | 4 ++-- .github/workflows/govulncheck.yml | 2 +- .github/workflows/release.yml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/env b/.github/env index 5d432ef0d..da6212635 100644 --- a/.github/env +++ b/.github/env @@ -1,2 +1,2 @@ -golang-version=1.24 -golangci-lint-version=v1.64 +GOLANG_VERSION=1.24 +GOLANGCI_LINT_VERSION=v1.64 diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 330b70aea..732c75311 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -24,7 +24,7 @@ jobs: - name: Setup Go uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # pin@5.3.0 with: - go-version: '${{ env.golang-version }}' + go-version: '${{ env.GOLANG_VERSION }}' check-latest: true - name: Test source headers are present run: make test-source-headers diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 649e0f693..2184cb256 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -19,9 +19,9 @@ jobs: - name: Setup Go uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # pin@5.3.0 with: - go-version: '${{ env.golang-version }}' + go-version: '${{ env.GOLANG_VERSION }}' check-latest: true - name: golangci-lint uses: golangci/golangci-lint-action@4696ba8babb6127d732c3c6dde519db15edab9ea #pin@6.5.1 with: - version: ${{ env.golangci-lint-version }} + version: ${{ env.GOLANGCI_LINT_VERSION }} diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml index d7505504b..1458184cb 100644 --- a/.github/workflows/govulncheck.yml +++ b/.github/workflows/govulncheck.yml @@ -18,7 +18,7 @@ jobs: - name: Setup Go uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # pin@5.3.0 with: - go-version: '${{ env.golang-version }}' + go-version: '${{ env.GOLANG_VERSION }}' check-latest: true - name: govulncheck uses: golang/govulncheck-action@b625fbe08f3bccbe446d94fbf87fcc875a4f50ee # pin@1.0.4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c0a72ddc5..3b341f55f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,7 +30,7 @@ jobs: - name: Setup Go uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # pin@5.3.0 with: - go-version: '${{ env.golang-version }}' + go-version: '${{ env.GOLANG_VERSION }}' - name: Run unit tests run: make test-coverage - name: Build Helm Binaries @@ -87,7 +87,7 @@ jobs: - name: Setup Go uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # pin@5.3.0 with: - go-version: '${{ env.golang-version }}' + go-version: '${{ env.GOLANG_VERSION }}' check-latest: true - name: Run unit tests From fcc9468b6033bfacdfe330632ad192bf75cdd842 Mon Sep 17 00:00:00 2001 From: dongjiang Date: Wed, 26 Mar 2025 11:10:23 +0800 Subject: [PATCH 5/6] fix comments Signed-off-by: dongjiang --- .github/workflows/build-test.yml | 2 +- .github/workflows/golangci-lint.yml | 2 +- .github/workflows/govulncheck.yml | 2 +- .github/workflows/release.yml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 732c75311..0772fc8f7 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Checkout source code uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pin@v4.2.2 - - name: Import environment variables from file + - name: Add variables to environment file run: cat ".github/env" >> "$GITHUB_ENV" - name: Setup Go uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # pin@5.3.0 diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 2184cb256..5bbe419cb 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -14,7 +14,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pin@v4.2.2 - - name: Import environment variables from file + - name: Add variables to environment file run: cat ".github/env" >> "$GITHUB_ENV" - name: Setup Go uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # pin@5.3.0 diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml index 1458184cb..56bdec7d6 100644 --- a/.github/workflows/govulncheck.yml +++ b/.github/workflows/govulncheck.yml @@ -13,7 +13,7 @@ jobs: name: govulncheck runs-on: ubuntu-latest steps: - - name: Import environment variables from file + - name: Add variables to environment file run: cat ".github/env" >> "$GITHUB_ENV" - name: Setup Go uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # pin@5.3.0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3b341f55f..10fce0b6b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ jobs: with: fetch-depth: 0 - - name: Import environment variables from file + - name: Add variables to environment file run: cat ".github/env" >> "$GITHUB_ENV" - name: Setup Go @@ -81,7 +81,7 @@ jobs: - name: Checkout source code uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pin@v4.2.2 - - name: Import environment variables from file + - name: Add variables to environment file run: cat ".github/env" >> "$GITHUB_ENV" - name: Setup Go From 5cb8335c4dd7c1cddfa7d60b32c555f568d772f8 Mon Sep 17 00:00:00 2001 From: dongjiang Date: Fri, 18 Apr 2025 10:16:28 +0800 Subject: [PATCH 6/6] Update .github/env Signed-off-by: dongjiang --- .github/env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/env b/.github/env index da6212635..b321f6ef7 100644 --- a/.github/env +++ b/.github/env @@ -1,2 +1,2 @@ GOLANG_VERSION=1.24 -GOLANGCI_LINT_VERSION=v1.64 +GOLANGCI_LINT_VERSION=v2.0.2