feat: upgrade go 1.20 -> 1.21

ryboe · Oct 2, 2023 · 8abbf47 · 8abbf47
1 parent 9daf262
commit 8abbf47
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 47 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -8,7 +8,7 @@ jobs:
   lint:
     name: GolangCI Lint
     runs-on: ubuntu-latest
-    container: golangci/golangci-lint:v1.50-alpine
+    container: golangci/golangci-lint:v1.54-alpine
 
     steps:
       - name: Checkout repository
@@ -20,7 +20,7 @@ jobs:
   tests:
     name: Run unit tests with the race detector enabled
     runs-on: ubuntu-latest
-    container: golang:1.20-alpine
+    container: golang:1.21-alpine
 
     steps:
       - name: Checkout repository

diff --git a/.golangci.yml b/.golangci.yml
@@ -7,6 +7,7 @@ linters:
   enable-all: true
   disable:
     - deadcode # deprecated
+    - depguard # enforces that only deps on a whitelist can be used (meant for orgs, not small projects)
     - exhaustivestruct
     - exhaustruct
     - forbidigo # we need to use fmt.Print*()

diff --git a/go.mod b/go.mod
@@ -1,10 +1,10 @@
 module github.com/ryboe/q
 
-go 1.20
+go 1.21
 
 require github.com/kr/pretty v0.3.1
 
 require (
 	github.com/kr/text v0.2.0 // indirect
-	github.com/rogpeppe/go-internal v1.9.0 // indirect
+	github.com/rogpeppe/go-internal v1.11.0 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -4,5 +4,6 @@ github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3x
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
-github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
+github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
+github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
diff --git a/vendor/github.com/rogpeppe/go-internal/fmtsort/mapelem.go b/vendor/github.com/rogpeppe/go-internal/fmtsort/mapelem.go
diff --git a/vendor/github.com/rogpeppe/go-internal/fmtsort/mapelem_1.11.go b/vendor/github.com/rogpeppe/go-internal/fmtsort/mapelem_1.11.go
diff --git a/vendor/github.com/rogpeppe/go-internal/fmtsort/sort.go b/vendor/github.com/rogpeppe/go-internal/fmtsort/sort.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -4,6 +4,6 @@ github.com/kr/pretty
 # github.com/kr/text v0.2.0
 ## explicit
 github.com/kr/text
-# github.com/rogpeppe/go-internal v1.9.0
-## explicit; go 1.17
+# github.com/rogpeppe/go-internal v1.11.0
+## explicit; go 1.19
 github.com/rogpeppe/go-internal/fmtsort