Skip to content

Commit eb2fd82

Browse files
authored
travis, appveyor, build, Dockerfile: bump Go to 1.14.2 (#20913)
* travis, appveyor, build, Dockerfile: bump Go to 1.14.2 * travis, appveyor: force GO111MODULE=on for every build
1 parent 5a20cc0 commit eb2fd82

File tree

5 files changed

+40
-17
lines changed

5 files changed

+40
-17
lines changed

.travis.yml

Lines changed: 34 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
allow_failures:
66
- stage: build
77
os: osx
8-
go: 1.13.x
8+
go: 1.14.x
99
env:
1010
- azure-osx
1111
- azure-ios
@@ -16,7 +16,7 @@ jobs:
1616
- stage: lint
1717
os: linux
1818
dist: xenial
19-
go: 1.13.x
19+
go: 1.14.x
2020
env:
2121
- lint
2222
git:
@@ -44,12 +44,24 @@ jobs:
4444
- go run build/ci.go install
4545
- go run build/ci.go test -coverage $TEST_PACKAGES
4646

47+
- stage: build
48+
os: linux
49+
dist: xenial
50+
go: 1.13.x
51+
env:
52+
- GO111MODULE=on
53+
script:
54+
- go run build/ci.go install
55+
- go run build/ci.go test -coverage $TEST_PACKAGES
56+
4757
# These are the latest Go versions.
4858
- stage: build
4959
os: linux
5060
arch: amd64
5161
dist: xenial
52-
go: 1.13.x
62+
go: 1.14.x
63+
env:
64+
- GO111MODULE=on
5365
script:
5466
- go run build/ci.go install
5567
- go run build/ci.go test -coverage $TEST_PACKAGES
@@ -59,15 +71,19 @@ jobs:
5971
os: linux
6072
arch: arm64
6173
dist: xenial
62-
go: 1.13.x
74+
go: 1.14.x
75+
env:
76+
- GO111MODULE=on
6377
script:
6478
- go run build/ci.go install
6579
- go run build/ci.go test -coverage $TEST_PACKAGES
6680

6781
- stage: build
6882
os: osx
6983
osx_image: xcode11.3
70-
go: 1.13.x
84+
go: 1.14.x
85+
env:
86+
- GO111MODULE=on
7187
script:
7288
- echo "Increase the maximum number of open file descriptors on macOS"
7389
- NOFILE=20480
@@ -86,9 +102,10 @@ jobs:
86102
if: type = push
87103
os: linux
88104
dist: xenial
89-
go: 1.13.x
105+
go: 1.14.x
90106
env:
91107
- ubuntu-ppa
108+
- GO111MODULE=on
92109
git:
93110
submodules: false # avoid cloning ethereum/tests
94111
addons:
@@ -102,17 +119,18 @@ jobs:
102119
- python-paramiko
103120
script:
104121
- echo '|1|7SiYPr9xl3uctzovOTj4gMwAC1M=|t6ReES75Bo/PxlOPJ6/GsGbTrM0= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0aKz5UTUndYgIGG7dQBV+HaeuEZJ2xPHo2DS2iSKvUL4xNMSAY4UguNW+pX56nAQmZKIZZ8MaEvSj6zMEDiq6HFfn5JcTlM80UwlnyKe8B8p7Nk06PPQLrnmQt5fh0HmEcZx+JU9TZsfCHPnX7MNz4ELfZE6cFsclClrKim3BHUIGq//t93DllB+h4O9LHjEUsQ1Sr63irDLSutkLJD6RXchjROXkNirlcNVHH/jwLWR5RcYilNX7S5bIkK8NlWPjsn/8Ua5O7I9/YoE97PpO6i73DTGLh5H9JN/SITwCKBkgSDWUt61uPK3Y11Gty7o2lWsBjhBUm2Y38CBsoGmBw==' >> ~/.ssh/known_hosts
105-
- go run build/ci.go debsrc -goversion 1.13.8 -upload ethereum/ethereum -sftp-user geth-ci -signer "Go Ethereum Linux Builder <[email protected]>"
122+
- go run build/ci.go debsrc -goversion 1.14.2 -upload ethereum/ethereum -sftp-user geth-ci -signer "Go Ethereum Linux Builder <[email protected]>"
106123

107124
# This builder does the Linux Azure uploads
108125
- stage: build
109126
if: type = push
110127
os: linux
111128
dist: xenial
112129
sudo: required
113-
go: 1.13.x
130+
go: 1.14.x
114131
env:
115132
- azure-linux
133+
- GO111MODULE=on
116134
git:
117135
submodules: false # avoid cloning ethereum/tests
118136
addons:
@@ -146,9 +164,10 @@ jobs:
146164
dist: xenial
147165
services:
148166
- docker
149-
go: 1.13.x
167+
go: 1.14.x
150168
env:
151169
- azure-linux-mips
170+
- GO111MODULE=on
152171
git:
153172
submodules: false # avoid cloning ethereum/tests
154173
script:
@@ -189,10 +208,11 @@ jobs:
189208
env:
190209
- azure-android
191210
- maven-android
211+
- GO111MODULE=on
192212
git:
193213
submodules: false # avoid cloning ethereum/tests
194214
before_install:
195-
- curl https://dl.google.com/go/go1.13.8.linux-amd64.tar.gz | tar -xz
215+
- curl https://dl.google.com/go/go1.14.2.linux-amd64.tar.gz | tar -xz
196216
- export PATH=`pwd`/go/bin:$PATH
197217
- export GOROOT=`pwd`/go
198218
- export GOPATH=$HOME/go
@@ -210,11 +230,12 @@ jobs:
210230
- stage: build
211231
if: type = push
212232
os: osx
213-
go: 1.13.x
233+
go: 1.14.x
214234
env:
215235
- azure-osx
216236
- azure-ios
217237
- cocoapods-ios
238+
- GO111MODULE=on
218239
git:
219240
submodules: false # avoid cloning ethereum/tests
220241
script:
@@ -241,9 +262,10 @@ jobs:
241262
if: type = cron
242263
os: linux
243264
dist: xenial
244-
go: 1.13.x
265+
go: 1.14.x
245266
env:
246267
- azure-purge
268+
- GO111MODULE=on
247269
git:
248270
submodules: false # avoid cloning ethereum/tests
249271
script:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build Geth in a stock Go builder container
2-
FROM golang:1.13-alpine as builder
2+
FROM golang:1.14-alpine as builder
33

44
RUN apk add --no-cache make gcc musl-dev linux-headers git
55

Dockerfile.alltools

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build Geth in a stock Go builder container
2-
FROM golang:1.13-alpine as builder
2+
FROM golang:1.14-alpine as builder
33

44
RUN apk add --no-cache make gcc musl-dev linux-headers git
55

appveyor.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ clone_depth: 5
66
version: "{branch}.{build}"
77
environment:
88
global:
9+
GO111MODULE: on
910
GOPATH: C:\gopath
1011
CC: gcc.exe
1112
matrix:
@@ -23,8 +24,8 @@ environment:
2324
install:
2425
- git submodule update --init
2526
- rmdir C:\go /s /q
26-
- appveyor DownloadFile https://dl.google.com/go/go1.13.8.windows-%GETH_ARCH%.zip
27-
- 7z x go1.13.8.windows-%GETH_ARCH%.zip -y -oC:\ > NUL
27+
- appveyor DownloadFile https://dl.google.com/go/go1.14.2.windows-%GETH_ARCH%.zip
28+
- 7z x go1.14.2.windows-%GETH_ARCH%.zip -y -oC:\ > NUL
2829
- go version
2930
- gcc --version
3031

build/checksums.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file contains sha256 checksums of optional build dependencies.
22

3-
b13bf04633d4d8cf53226ebeaace8d4d2fd07ae6fa676d0844a688339debec34 go1.13.8.src.tar.gz
3+
98de84e69726a66da7b4e58eac41b99cbe274d7e8906eeb8a5b7eb0aadee7f7c go1.14.2.src.tar.gz
44

55
aeaa5498682246b87d0b77ece283897348ea03d98e816760a074058bfca60b2a golangci-lint-1.24.0-windows-amd64.zip
66
7e854a70d449fe77b7a91583ec88c8603eb3bf96c45d52797dc4ba3f2f278dbe golangci-lint-1.24.0-darwin-386.tar.gz

0 commit comments

Comments
 (0)