travis, appveyor, build, Dockerfile: bump Go to 1.16 (#22351)

karalabe · web-flow · commit 4ee8d2d30548 · 2021-02-23T18:42:43.000+02:00
* travis, appveyor, build: bump Go to 1.16

* accounts/abi/bind: fix up Go mod files for Go 1.16
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ jobs:
   allow_failures:
     - stage: build
       os: osx
-      go: 1.14.x
+      go: 1.15.x
       env:
         - azure-osx
         - azure-ios
@@ -16,7 +16,7 @@ jobs:
     - stage: lint
       os: linux
       dist: xenial
-      go: 1.15.x
+      go: 1.16.x
       env:
         - lint
       git:
@@ -29,7 +29,7 @@ jobs:
       if: type = push
       os: linux
       dist: xenial
-      go: 1.15.x
+      go: 1.16.x
       env:
         - ubuntu-ppa
         - GO111MODULE=on
@@ -54,7 +54,7 @@ jobs:
       os: linux
       dist: xenial
       sudo: required
-      go: 1.15.x
+      go: 1.16.x
       env:
         - azure-linux
         - GO111MODULE=on
@@ -91,7 +91,7 @@ jobs:
       dist: xenial
       services:
         - docker
-      go: 1.15.x
+      go: 1.16.x
       env:
         - azure-linux-mips
         - GO111MODULE=on
@@ -139,7 +139,7 @@ jobs:
       git:
         submodules: false # avoid cloning ethereum/tests
       before_install:
-        - curl https://dl.google.com/go/go1.15.5.linux-amd64.tar.gz | tar -xz
+        - curl https://dl.google.com/go/go1.16.linux-amd64.tar.gz | tar -xz
         - export PATH=`pwd`/go/bin:$PATH
         - export GOROOT=`pwd`/go
         - export GOPATH=$HOME/go
@@ -157,7 +157,7 @@ jobs:
     - stage: build
       if: type = push
       os: osx
-      go: 1.15.x
+      go: 1.16.x
       env:
         - azure-osx
         - azure-ios
@@ -189,7 +189,7 @@ jobs:
       os: linux
       arch: amd64
       dist: xenial
-      go: 1.15.x
+      go: 1.16.x
       env:
         - GO111MODULE=on
       script:
@@ -200,7 +200,7 @@ jobs:
       os: linux
       arch: arm64
       dist: xenial
-      go: 1.15.x
+      go: 1.16.x
       env:
         - GO111MODULE=on
       script:
@@ -209,7 +209,7 @@ jobs:
     - stage: build
       os: linux
       dist: xenial
-      go: 1.14.x
+      go: 1.15.x
       env:
         - GO111MODULE=on
       script:
@@ -220,7 +220,7 @@ jobs:
       if: type = cron
       os: linux
       dist: xenial
-      go: 1.15.x
+      go: 1.16.x
       env:
         - azure-purge
         - GO111MODULE=on
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build Geth in a stock Go builder container
-FROM golang:1.15-alpine as builder
+FROM golang:1.16-alpine as builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git
 
diff --git a/Dockerfile.alltools b/Dockerfile.alltools
@@ -1,5 +1,5 @@
 # Build Geth in a stock Go builder container
-FROM golang:1.15-alpine as builder
+FROM golang:1.16-alpine as builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git
 
diff --git a/accounts/abi/bind/bind_test.go b/accounts/abi/bind/bind_test.go
@@ -1846,11 +1846,16 @@ func TestGolangBindings(t *testing.T) {
 		t.Fatalf("failed to convert binding test to modules: %v\n%s", err, out)
 	}
 	pwd, _ := os.Getwd()
-	replacer := exec.Command(gocmd, "mod", "edit", "-replace", "github.com/ethereum/go-ethereum="+filepath.Join(pwd, "..", "..", "..")) // Repo root
+	replacer := exec.Command(gocmd, "mod", "edit", "-x", "-require", "github.com/ethereum/go-ethereum@v0.0.0", "-replace", "github.com/ethereum/go-ethereum="+filepath.Join(pwd, "..", "..", "..")) // Repo root
 	replacer.Dir = pkg
 	if out, err := replacer.CombinedOutput(); err != nil {
 		t.Fatalf("failed to replace binding test dependency to current source tree: %v\n%s", err, out)
 	}
+	tidier := exec.Command(gocmd, "mod", "tidy")
+	tidier.Dir = pkg
+	if out, err := tidier.CombinedOutput(); err != nil {
+		t.Fatalf("failed to tidy Go module file: %v\n%s", err, out)
+	}
 	// Test the entire package and report any failures
 	cmd := exec.Command(gocmd, "test", "-v", "-count", "1")
 	cmd.Dir = pkg
diff --git a/appveyor.yml b/appveyor.yml
@@ -24,8 +24,8 @@ environment:
 install:
   - git submodule update --init
   - rmdir C:\go /s /q
-  - appveyor DownloadFile https://dl.google.com/go/go1.15.5.windows-%GETH_ARCH%.zip
-  - 7z x go1.15.5.windows-%GETH_ARCH%.zip -y -oC:\ > NUL
+  - appveyor DownloadFile https://dl.google.com/go/go1.16.windows-%GETH_ARCH%.zip
+  - 7z x go1.16.windows-%GETH_ARCH%.zip -y -oC:\ > NUL
   - go version
   - gcc --version
 
diff --git a/build/checksums.txt b/build/checksums.txt
@@ -1,17 +1,17 @@
 # This file contains sha256 checksums of optional build dependencies.
 
-890bba73c5e2b19ffb1180e385ea225059eb008eb91b694875dd86ea48675817  go1.15.6.src.tar.gz
-940a73b45993a3bae5792cf324140dded34af97c548af4864d22fd6d49f3bd9f  go1.15.6.darwin-amd64.tar.gz
-ad187f02158b9a9013ef03f41d14aa69c402477f178825a3940280814bcbb755  go1.15.6.linux-386.tar.gz
-3918e6cc85e7eaaa6f859f1bdbaac772e7a825b0eb423c63d3ae68b21f84b844  go1.15.6.linux-amd64.tar.gz
-f87515b9744154ffe31182da9341d0a61eb0795551173d242c8cad209239e492  go1.15.6.linux-arm64.tar.gz
-40ba9a57764e374195018ef37c38a5fbac9bbce908eab436370631a84bfc5788  go1.15.6.linux-armv6l.tar.gz
-5872eff6746a0a5f304272b27cbe9ce186f468454e95749cce01e903fbfc0e17  go1.15.6.windows-386.zip
-b7b3808bb072c2bab73175009187fd5a7f20ffe0a31739937003a14c5c4d9006  go1.15.6.windows-amd64.zip
-9d9dd5c217c1392f1b2ed5e03e1c71bf4cf8553884e57a38e68fd37fdcfe31a8  go1.15.6.freebsd-386.tar.gz
-609f065d855aed5a0b40ef0245aacbcc0b4b7882dc3b1e75ae50576cf25265ee  go1.15.6.freebsd-amd64.tar.gz
-d4174fc217e749ac049eacc8827df879689f2246ac230d04991ae7df336f7cb2  go1.15.6.linux-ppc64le.tar.gz
-839cc6b67687d8bb7cb044e4a9a2eac0c090765cc8ec55ffe714dfb7cd51cf3a  go1.15.6.linux-s390x.tar.gz
+7688063d55656105898f323d90a79a39c378d86fe89ae192eb3b7fc46347c95a  go1.16.src.tar.gz
+6000a9522975d116bf76044967d7e69e04e982e9625330d9a539a8b45395f9a8  go1.16.darwin-amd64.tar.gz
+ea435a1ac6d497b03e367fdfb74b33e961d813883468080f6e239b3b03bea6aa  go1.16.linux-386.tar.gz
+013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2  go1.16.linux-amd64.tar.gz
+3770f7eb22d05e25fbee8fb53c2a4e897da043eb83c69b9a14f8d98562cd8098  go1.16.linux-arm64.tar.gz
+d1d9404b1dbd77afa2bdc70934e10fbfcf7d785c372efc29462bb7d83d0a32fd  go1.16.linux-armv6l.tar.gz
+481492a17d42193d471b93b7a06da3555331bd833b76336afc87be820c48933f  go1.16.windows-386.zip
+5cc88fa506b3d5c453c54c3ea218fc8dd05d7362ae1de15bb67986b72089ce93  go1.16.windows-amd64.zip
+d7d6c70b05a7c2f68b48aab5ab8cb5116b8444c9ddad131673b152e7cff7c726  go1.16.freebsd-386.tar.gz
+40b03216f6945fb6883a50604fc7f409a83f62171607229a9c598e701e684f8a  go1.16.freebsd-amd64.tar.gz
+27a1aaa988e930b7932ce459c8a63ad5b3333b3a06b016d87ff289f2a11aacd6  go1.16.linux-ppc64le.tar.gz
+be4c9e4e2cf058efc4e3eb013a760cb989ddc4362f111950c990d1c63b27ccbe  go1.16.linux-s390x.tar.gz
 
 d998a84eea42f2271aca792a7b027ca5c1edfcba229e8e5a844c9ac3f336df35  golangci-lint-1.27.0-linux-armv7.tar.gz
 bf781f05b0d393b4bf0a327d9e62926949a4f14d7774d950c4e009fc766ed1d4  golangci-lint.exe-1.27.0-windows-amd64.zip
diff --git a/build/ci.go b/build/ci.go
@@ -152,7 +152,7 @@ var (
 	// This is the version of go that will be downloaded by
 	//
 	//     go run ci.go install -dlgo
-	dlgoVersion = "1.15.6"
+	dlgoVersion = "1.16"
 )
 
 var GOBIN, _ = filepath.Abs(filepath.Join("build", "bin"))

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ var (`
`152`	`152`	`// This is the version of go that will be downloaded by`
`153`	`153`	`//`
`154`	`154`	`// go run ci.go install -dlgo`
`155`		`- dlgoVersion = "1.15.6"`
	`155`	`+ dlgoVersion = "1.16"`
`156`	`156`	`)`
`157`	`157`
`158`	`158`	`var GOBIN, _ = filepath.Abs(filepath.Join("build", "bin"))`