From 92a0383b817ca6602d855caa0fa4012cf44bb452 Mon Sep 17 00:00:00 2001
From: Nick Rosbrook <nr@enr0n.net>
Date: Mon, 19 Aug 2024 20:52:41 -0400
Subject: [PATCH] all: bump to 1.23

---
 .github/workflows/lint.yaml | 35 ++++++++++++++++++-----------------
 .github/workflows/test.yaml |  2 +-
 .golangci.yml               | 10 +++-------
 go.mod                      |  2 +-
 4 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 496d282..2f4700b 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -1,20 +1,21 @@
 on: [push, pull_request]
-name: Lint
+name: golangci-lint
+
+permissions:
+  contents: read
+  # Optional: allow read access to pull request. Use with `only-new-issues` option.
+  # pull-requests: read
+
 jobs:
-  lint:
-    strategy:
-      matrix:
-        go-version: [1.20.x]
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
     steps:
-    - name: Install Go
-      uses: actions/setup-go@v3
-      with:
-        go-version: ${{ matrix.go-version }}
-    - name: Checkout code
-      uses: actions/checkout@v3
-    - name: golangci-lint
-      uses: golangci/golangci-lint-action@v3
-      with:
-        version: latest
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: stable
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v6
+        with:
+          version: v1.60
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 7f59114..6ffa540 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -4,7 +4,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.23.x]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/.golangci.yml b/.golangci.yml
index b26f2c3..715ff32 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -10,7 +10,7 @@ linters:
   enable:
 #  - asciicheck
   - bodyclose
-  - deadcode
+  - unused
   - depguard
   - dogsled
   - dupl
@@ -32,7 +32,7 @@ linters:
 #  - gofumpt
 #  - goheader
   - goimports
-  - golint
+  - revive
 #  - gomnd
 #  - gomodguard
   - goprintffuncname
@@ -40,9 +40,7 @@ linters:
   - gosimple
   - govet
   - ineffassign
-  - interfacer
 #  - lll
-  - maligned
   - misspell
   - nakedret
 #  - nestif
@@ -51,16 +49,14 @@ linters:
 #  - nolintlint
   - prealloc
   - rowserrcheck
-  - scopelint
+  - copyloopvar
 #  - sqlclosecheck
   - staticcheck
-  - structcheck
   - stylecheck
 #  - testpackage
   - typecheck
   - unconvert
   - unparam
   - unused
-  - varcheck
   - whitespace
 #  - wsl
diff --git a/go.mod b/go.mod
index 9fb14b4..04d1bdf 100644
--- a/go.mod
+++ b/go.mod
@@ -1,3 +1,3 @@
 module github.com/strongswan/govici
 
-go 1.20
+go 1.23