Merge pull request #887 from CircleCI-Public/merge-main

Merge main
CircleCI-Public · Mar 23, 2023 · 667c7b3 · 667c7b3
2 parents 651f295 + 3ef1325
commit 667c7b3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,7 +7,7 @@ orbs:
 executors:
   go:
     docker:
-      - image: cimg/go:1.18
+      - image: cimg/go:1.20
     environment:
       CGO_ENABLED: 0
   mac:
@@ -108,8 +108,8 @@ jobs:
       - checkout
       - run: |
           brew update
-          brew install go@1.18
-          echo 'export PATH="/usr/local/opt/go@1.18/bin:$PATH"' >> ~/.bash_profile
+          brew install go@1.20
+          echo 'export PATH="/usr/local/opt/go@1.20/bin:$PATH"' >> ~/.bash_profile
       - gomod
       - run: make test
   build:

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM cimg/go:1.18.3
+FROM cimg/go:1.20
 
 ENV CIRCLECI_CLI_SKIP_UPDATE_CHECK true
 

diff --git a/go.mod b/go.mod
@@ -98,4 +98,4 @@ require (
 // fix vulnerability: CVE-2020-15114 in etcd v3.3.10+incompatible
 replace github.com/coreos/etcd => github.com/coreos/etcd v3.3.24+incompatible
 
-go 1.18
+go 1.20
-Original file line number
+Diff line change
@@ Expand Up / @@ -98,4 +98,4 @@ require ( @@
     // fix vulnerability: CVE-2020-15114 in etcd v3.3.10+incompatible
     replace github.com/coreos/etcd => github.com/coreos/etcd v3.3.24+incompatible
-    go 1.18
+    go 1.20