use go 1.22 and make go 1.20.14 as minimum (#378)

theparanoids · Feb 21, 2024 · 4cb44ac · 4cb44ac
1 parent d04a9d0
commit 4cb44ac
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 2,220 deletions.
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -21,7 +21,7 @@ on:
 permissions:
   contents: read
 env:
-  GO_VERSION: 1.21.3
+  GO_VERSION: 1.22.0
 jobs:
   golangci:
     name: lint

diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml
@@ -21,7 +21,7 @@ on:
   pull_request:
 
 env:
-  GO_VERSION: 1.21.3
+  GO_VERSION: 1.22.0
 
 jobs:
   license-check:

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: [ '1.19.x', '1.20.x', '1.21.x' ]
+        go: [ '1.20.x', '1.21.x', '1.22.x' ]
     name: Go ${{ matrix.go }} build
     steps:
       - name: checkout

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,7 +24,7 @@ permissions:
   id-token: write # needed for keyless signing
   packages: write # needed to upload artifacts
 env:
-  GO_VERSION: 1.21.3
+  GO_VERSION: 1.22.0
 
 jobs:
   release:

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ You should be able to run crypki server on any linux platform as long as you hav
 
 Prerequisites:
 
-- Go >= 1.19
+- Go >= 1.20.14
 
 Run:
 

diff --git a/docker-softhsm/Dockerfile b/docker-softhsm/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.20.6
+FROM golang:1.22.0
 ENV CRYPKI_DIR /go/src/github.com/theparanoids/crypki
 COPY . ${CRYPKI_DIR}
 WORKDIR ${CRYPKI_DIR}

diff --git a/go.mod b/go.mod
@@ -1,16 +1,31 @@
 module github.com/theparanoids/crypki
 
-go 1.16
+go 1.20
 
 require (
 	github.com/golang/mock v1.6.0
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1
 	github.com/miekg/pkcs11 v1.1.1
 	golang.org/x/crypto v0.19.0
-	golang.org/x/tools v0.11.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe
 	google.golang.org/grpc v1.61.1
 	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
 	google.golang.org/protobuf v1.32.0
 )
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/rogpeppe/go-internal v1.12.0 // indirect
+	github.com/stretchr/testify v1.7.0 // indirect
+	golang.org/x/mod v0.12.0 // indirect
+	golang.org/x/net v0.20.0 // indirect
+	golang.org/x/sys v0.17.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/tools v0.11.0 // indirect
+	google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)
diff --git a/go.sum b/go.sum
-Original file line number
+Diff line change
@@ Expand Up @@
     Prerequisites:
-    - Go >= 1.19
+    - Go >= 1.20.14
     Run:
@@ Expand Down @@