chore: go 1.20 (#312)

* chore: go 1.20 * f
replicatedcom · Jun 6, 2023 · 7a78d6b · 7a78d6b
1 parent bfb62da
commit 7a78d6b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 21 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,8 +7,7 @@ jobs:
 
   docs:
     docker:
-      - image: cimg/go:1.17
-    working_directory: /home/circleci/go/src/github.com/replicatedcom/support-bundle
+      - image: cimg/go:1.20
     steps:
       - checkout
       - run: |
@@ -20,15 +19,14 @@ jobs:
           make pipeline-nointegration
   test:
     docker:
-      - image: cimg/go:1.17
-    working_directory: /home/circleci/go/src/github.com/replicatedcom/support-bundle
+      - image: cimg/go:1.20
     steps:
       - checkout
       - run: make build-deps ci-test # ci-upload-coverage
 
   scan:
     docker:
-      - image: cimg/go:1.17
+      - image: cimg/go:1.20
     steps:
       - checkout
       - setup_remote_docker
@@ -45,7 +43,6 @@ jobs:
   e2e:
     # Use machine for volume binding support in Docker
     machine: true
-    working_directory: /home/circleci/go/src/github.com/replicatedcom/support-bundle
     environment:
       GOPATH: /home/circleci/go
       GO_SHA256SUM: 87fc728c9c731e2f74e4a999ef53cf07302d7ed3504b0839027bd9c10edaa3fd
@@ -68,7 +65,7 @@ jobs:
           tar -zxvf golang.tar.gz -C /tmp
           sudo rm -rf ${GOROOT}
           sudo mv /tmp/go ${GOROOT}
-      - run: docker run -d --entrypoint sh --label com.replicated.support-bundle=true cimg/go:1.17 -c "sleep infinity"
+      - run: docker run -d --entrypoint sh --label com.replicated.support-bundle=true cimg/go:1.20 -c "sleep infinity"
       - run: |
           export GOPATH=/home/circleci/go
           export GOROOT=/usr/local/go
@@ -81,8 +78,7 @@ jobs:
 
   deploy:
     docker:
-      - image: cimg/go:1.17
-    working_directory: /home/circleci/go/src/github.com/replicatedcom/support-bundle
+      - image: cimg/go:1.20
     steps:
       - checkout
       - setup_remote_docker
@@ -94,8 +90,7 @@ jobs:
 
   deploy_unstable:
     docker:
-      - image: cimg/go:1.17
-    working_directory: /home/circleci/go/src/github.com/replicatedcom/support-bundle
+      - image: cimg/go:1.20
     steps:
       - checkout
       - setup_remote_docker

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.17
+FROM golang:1.20
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install --no-install-recommends -y \
     jq \

diff --git a/Makefile b/Makefile
@@ -113,11 +113,11 @@ bin/support-bundle: $(SRC) pkg/collect/bundle/defaultspec/asset.go
 	@echo built bin/support-bundle
 
 build-deps:
-	go get golang.org/x/lint/golint@v0.0.0-20210508222113-6edffad5e616
-	go get golang.org/x/tools/cmd/goimports@v0.1.12
-	go get github.com/a-urth/go-bindata/go-bindata@v0.0.0-20180209162145-df38da164efc
-	go get github.com/onsi/ginkgo/ginkgo@v1.16.5
-	go get github.com/golang/mock/mockgen@v1.6.0
+	go install golang.org/x/lint/golint@latest
+	go install golang.org/x/tools/cmd/goimports@latest
+	go install github.com/a-urth/go-bindata/go-bindata@latest
+	go install github.com/onsi/ginkgo/ginkgo@latest
+	go install github.com/golang/mock/mockgen@latest
 
 .state/coverage.out: $(SRC)
 	@mkdir -p .state/
@@ -149,7 +149,7 @@ e2e-supportbundle-core:
 		-v /var/run/docker.sock:/var/run/docker.sock                        \
 		-w /go/src/$(PKG)                                                   \
 		-l com.replicated.support-bundle=true                               \
-		golang:1.17                                                         \
+		golang:1.20                                                         \
 		/bin/sh -c "                                                        \
 			./e2e/collect/e2e.sh                                            \
 		"
@@ -164,7 +164,7 @@ e2e-supportbundle-docker:
 		-w /go/src/$(PKG)                                                   \
 		-l com.replicated.support-bundle=true                               \
 		-e DOCKER=1                                                         \
-		golang:1.17                                                         \
+		golang:1.20                                                         \
 		/bin/sh -c "                                                        \
 			./e2e/collect/e2e.sh                                            \
 		"
@@ -178,7 +178,7 @@ e2e-supportbundle-swarm:
 		-w /go/src/$(PKG)                                                   \
 		-l com.replicated.support-bundle=true                               \
 		-e SWARM=1                                                          \
-		golang:1.17                                                         \
+		golang:1.20                                                         \
 		/bin/sh -c "                                                        \
 			./e2e/collect/e2e.sh                                            \
 		"

diff --git a/e2e/collect/e2e.sh b/e2e/collect/e2e.sh
@@ -3,7 +3,7 @@
 set -o errexit
 set -o nounset
 
-go get github.com/onsi/ginkgo/ginkgo
+go install github.com/onsi/ginkgo/ginkgo@latest
 
 if [ -n "${DOCKER+x}" ]; then
     echo "Running e2e tests (docker enabled):"