From 2290ee51edb3aef28a87c087c0aef638003587fd Mon Sep 17 00:00:00 2001 From: Robin Hahling Date: Tue, 10 Sep 2024 10:35:23 +0200 Subject: [PATCH 1/2] ci: drop support for Go 1.21, test for Go 1.22 and 1.23 Signed-off-by: Robin Hahling --- .github/workflows/pr-check.yaml | 12 ++++++------ go.mod | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pr-check.yaml b/.github/workflows/pr-check.yaml index 1159284..b371df6 100644 --- a/.github/workflows/pr-check.yaml +++ b/.github/workflows/pr-check.yaml @@ -16,9 +16,9 @@ jobs: - tip include: - name: oldstable - version: "1.21" - - name: stable version: "1.22" + - name: stable + version: "1.23" runs-on: ubuntu-latest steps: - name: Install Go v${{ matrix.name }} @@ -41,9 +41,9 @@ jobs: - tip include: - name: oldstable - version: "1.21" - - name: stable version: "1.22" + - name: stable + version: "1.23" runs-on: ubuntu-latest steps: - name: Install Go v${{ matrix.name }} @@ -64,9 +64,9 @@ jobs: - tip include: - name: oldstable - version: "1.21" - - name: stable version: "1.22" + - name: stable + version: "1.23" runs-on: ubuntu-latest steps: - name: Install Go v${{ matrix.name }} diff --git a/go.mod b/go.mod index 9cf398d..daf9124 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/cilium/linters -go 1.21 +go 1.22 require ( golang.org/x/exp v0.0.0-20230809094429-853ea248256d From 95f99d8325dd37da41c2c56e54505cf478582983 Mon Sep 17 00:00:00 2001 From: Robin Hahling Date: Tue, 10 Sep 2024 10:40:39 +0200 Subject: [PATCH 2/2] ci: update golangci-lint to v1.61.0 While here, remove now deprecated exportloopref linter which is no longer relevant with Go v1.22+. Signed-off-by: Robin Hahling --- .github/workflows/pr-check.yaml | 2 +- .golangci.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/pr-check.yaml b/.github/workflows/pr-check.yaml index b371df6..8fc9b39 100644 --- a/.github/workflows/pr-check.yaml +++ b/.github/workflows/pr-check.yaml @@ -87,7 +87,7 @@ jobs: - name: Run golangci lint uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 with: - version: v1.58.1 + version: v1.61.0 # use our .golangci.yml and configure output to be logged in the GHA, # in addition to annotating the commit. see # https://github.com/golangci/golangci-lint-action/issues/119#issuecomment-981090648 diff --git a/.golangci.yml b/.golangci.yml index 718e77b..c2a861e 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -24,7 +24,6 @@ linters: - errname - errorlint - exhaustive - - exportloopref - forcetypeassert - gocheckcompilerdirectives - gocognit