From d83a33deccb4997530e8ad1140391f7cd1178bac Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Thu, 12 Sep 2024 10:06:09 +0200 Subject: [PATCH] Switch to go 1.23 Signed-off-by: Sascha Grunert --- .github/workflows/e2e.yml | 2 +- .golangci.yml | 1 - dependencies.yaml | 6 +----- git/git_test.go | 4 ++-- go.mod | 4 ++-- go.sum | 4 ++-- 6 files changed, 8 insertions(+), 13 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index a46e354..00ed0be 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -25,7 +25,7 @@ jobs: - name: Setup golang uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: '1.22' + go-version: '1.23' check-latest: true cache: true diff --git a/.golangci.yml b/.golangci.yml index 316f288..5728ee4 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -38,7 +38,6 @@ linters: - errchkjson - errname - exhaustive - - exportloopref - fatcontext - forbidigo - gci diff --git a/dependencies.yaml b/dependencies.yaml index ccb80d6..c8528c7 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,9 @@ --- dependencies: - name: go (GitHub Actions) - version: 1.22 + version: 1.23 refPaths: - path: .github/workflows/e2e.yml match: go-version - - - name: go (go.mod) - version: 1.22.5 - refPaths: - path: go.mod match: go diff --git a/git/git_test.go b/git/git_test.go index 308a376..c6dc75d 100644 --- a/git/git_test.go +++ b/git/git_test.go @@ -128,7 +128,7 @@ func TestGetUserName(t *testing.T) { require.NotEqual(t, fakeUserName, "") envVarName := fakeUserName + " env var" - require.NoError(t, os.Setenv("GIT_COMMITTER_NAME", envVarName)) + t.Setenv("GIT_COMMITTER_NAME", envVarName) actual, err = git.GetUserName() require.NoError(t, err) require.Equal(t, envVarName, actual) @@ -163,7 +163,7 @@ func TestGetUserEmail(t *testing.T) { require.NotEqual(t, fakeUserEmail, "") envVarEmail := "kubernetes-honk@example.com" - require.NoError(t, os.Setenv("GIT_COMMITTER_EMAIL", envVarEmail)) + t.Setenv("GIT_COMMITTER_EMAIL", envVarEmail) actual, err = git.GetUserEmail() require.NoError(t, err) require.Equal(t, envVarEmail, actual) diff --git a/go.mod b/go.mod index 0ab7be4..4874df1 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/release-sdk -go 1.22.5 +go 1.23 require ( github.com/blang/semver/v4 v4.0.0 @@ -20,7 +20,7 @@ require ( golang.org/x/oauth2 v0.23.0 k8s.io/apimachinery v0.31.1 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 - sigs.k8s.io/release-utils v0.8.4 + sigs.k8s.io/release-utils v0.8.5 ) require ( diff --git a/go.sum b/go.sum index 1671585..1cabb2b 100644 --- a/go.sum +++ b/go.sum @@ -1015,8 +1015,8 @@ k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/release-utils v0.8.4 h1:4QVr3UgbyY/d9p74LBhg0njSVQofUsAZqYOzVZBhdBw= -sigs.k8s.io/release-utils v0.8.4/go.mod h1:m1bHfscTemQp+z+pLCZnkXih9n0+WukIUU70n6nFnU0= +sigs.k8s.io/release-utils v0.8.5 h1:FUtFqEAN621gSXv0L7kHyWruBeS7TUU9aWf76olX7uQ= +sigs.k8s.io/release-utils v0.8.5/go.mod h1:qsm5bdxdgoHkD8HsXpgme2/c3mdsNaiV53Sz2HmKeJA= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=