chore: upgrade go to 1.20

zeromicro · Oct 28, 2023 · 257d8dc · 257d8dc
1 parent 52963c2
commit 257d8dc
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -17,7 +17,7 @@ jobs:
  - name: Set up Go 1.x
  uses: actions/setup-go@v4
  with:
- go-version: 1.19
+ go-version: '1.20'
  check-latest: true
  cache: true
  id: go
@@ -52,8 +52,8 @@ jobs:
  - name: Set up Go 1.x
  uses: actions/setup-go@v4
  with:
- # use 1.19 to guarantee Go 1.19 compatibility
- go-version: 1.19
+ # use 1.20 to guarantee Go 1.20 compatibility
+ go-version: '1.20'
  check-latest: true
  cache: true
 

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -22,7 +22,7 @@ jobs:
  github_token: ${{ secrets.GITHUB_TOKEN }}
  goos: ${{ matrix.goos }}
  goarch: ${{ matrix.goarch }}
- goversion: "https://dl.google.com/go/go1.19.13.linux-amd64.tar.gz"
+ goversion: "https://dl.google.com/go/go1.20.10.linux-amd64.tar.gz"
  project_path: "tools/goctl"
  binary_name: "goctl"
  extra_files: tools/goctl/readme.md tools/goctl/readme-cn.md
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/zeromicro/go-zero
 
-go 1.19
+go 1.20
 
 require (
  github.com/DATA-DOG/go-sqlmock v1.5.0
@@ -32,7 +32,7 @@ require (
  go.opentelemetry.io/otel/sdk v1.19.0
  go.opentelemetry.io/otel/trace v1.19.0
  go.uber.org/automaxprocs v1.5.3
- go.uber.org/goleak v1.2.1
+ go.uber.org/goleak v1.3.0
  golang.org/x/net v0.17.0
  golang.org/x/sys v0.13.0
  golang.org/x/time v0.3.0

diff --git a/go.sum b/go.sum
@@ -220,8 +220,8 @@ go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
 go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8=
 go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0=
-go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
-go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=
 go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
 go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=

diff --git a/tools/goctl/go.mod b/tools/goctl/go.mod
@@ -1,6 +1,6 @@
 module github.com/zeromicro/go-zero/tools/goctl
 
-go 1.19
+go 1.20
 
 require (
  github.com/DATA-DOG/go-sqlmock v1.5.0

diff --git a/tools/goctl/test/integration/model/mongo/Dockerfile b/tools/goctl/test/integration/model/mongo/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.19
+FROM golang:1.20
 
 ENV TZ Asia/Shanghai
 ENV GOPROXY https://goproxy.cn,direct

diff --git a/tools/goctl/util/ctx/gomod_test.go b/tools/goctl/util/ctx/gomod_test.go
@@ -81,21 +81,21 @@ func Test_getRealModule(t *testing.T) {
  "Path":"foo",
  "Dir":"/home/foo",
  "GoMod":"/home/foo/go.mod",
- "GoVersion":"go1.19"
+ "GoVersion":"go1.20"
  }
  {
  "Path":"bar",
  "Dir":"/home/bar",
  "GoMod":"/home/bar/go.mod",
- "GoVersion":"go1.19"
+ "GoVersion":"go1.20"
  }`, nil
  },
  },
  want: &Module{
  Path: "bar",
  Dir: "/home/bar",
  GoMod: "/home/bar/go.mod",
- GoVersion: "go1.19",
+ GoVersion: "go1.20",
  },
  },
  }
@@ -143,26 +143,26 @@ func TestDecodePackages(t *testing.T) {
  "Path":"foo",
  "Dir":"/home/foo",
  "GoMod":"/home/foo/go.mod",
- "GoVersion":"go1.19"
+ "GoVersion":"go1.20"
  }
  {
  "Path":"bar",
  "Dir":"/home/bar",
  "GoMod":"/home/bar/go.mod",
- "GoVersion":"go1.19"
+ "GoVersion":"go1.20"
  }`),
  want: []Module{
  {
  Path: "foo",
  Dir: "/home/foo",
  GoMod: "/home/foo/go.mod",
- GoVersion: "go1.19",
+ GoVersion: "go1.20",
  },
  {
  Path: "bar",
  Dir: "/home/bar",
  GoMod: "/home/bar/go.mod",
- GoVersion: "go1.19",
+ GoVersion: "go1.20",
  },
  },
  },
@@ -173,14 +173,14 @@ func TestDecodePackages(t *testing.T) {
  "Path":"foo",
  "Dir":"/home/foo",
  "GoMod":"/home/foo/go.mod",
- "GoVersion":"go1.19"
+ "GoVersion":"go1.20"
  }`),
  want: []Module{
  {
  Path: "foo",
  Dir: "/home/foo",
  GoMod: "/home/foo/go.mod",
- GoVersion: "go1.19",
+ GoVersion: "go1.20",
  },
  },
  },