Skip to content

Commit a70a79b

Browse files
authored
Merge pull request ethereum#21466 from karalabe/go1.15
travis, dockerfile, appveyor, build: bump to Go 1.15
2 parents 8cbdc86 + 15fdaf2 commit a70a79b

File tree

5 files changed

+26
-16
lines changed

5 files changed

+26
-16
lines changed

.travis.yml

+21-11
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- stage: lint
1717
os: linux
1818
dist: xenial
19-
go: 1.14.x
19+
go: 1.15.x
2020
env:
2121
- lint
2222
git:
@@ -34,12 +34,22 @@ jobs:
3434
- go run build/ci.go install
3535
- go run build/ci.go test -coverage $TEST_PACKAGES
3636

37+
- stage: build
38+
os: linux
39+
dist: xenial
40+
go: 1.14.x
41+
env:
42+
- GO111MODULE=on
43+
script:
44+
- go run build/ci.go install
45+
- go run build/ci.go test -coverage $TEST_PACKAGES
46+
3747
# These are the latest Go versions.
3848
- stage: build
3949
os: linux
4050
arch: amd64
4151
dist: xenial
42-
go: 1.14.x
52+
go: 1.15.x
4353
env:
4454
- GO111MODULE=on
4555
script:
@@ -51,7 +61,7 @@ jobs:
5161
os: linux
5262
arch: arm64
5363
dist: xenial
54-
go: 1.14.x
64+
go: 1.15.x
5565
env:
5666
- GO111MODULE=on
5767
script:
@@ -61,7 +71,7 @@ jobs:
6171
- stage: build
6272
os: osx
6373
osx_image: xcode11.3
64-
go: 1.14.x
74+
go: 1.15.x
6575
env:
6676
- GO111MODULE=on
6777
script:
@@ -82,7 +92,7 @@ jobs:
8292
if: type = push
8393
os: linux
8494
dist: xenial
85-
go: 1.14.x
95+
go: 1.15.x
8696
env:
8797
- ubuntu-ppa
8898
- GO111MODULE=on
@@ -99,15 +109,15 @@ jobs:
99109
- python-paramiko
100110
script:
101111
- echo '|1|7SiYPr9xl3uctzovOTj4gMwAC1M=|t6ReES75Bo/PxlOPJ6/GsGbTrM0= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0aKz5UTUndYgIGG7dQBV+HaeuEZJ2xPHo2DS2iSKvUL4xNMSAY4UguNW+pX56nAQmZKIZZ8MaEvSj6zMEDiq6HFfn5JcTlM80UwlnyKe8B8p7Nk06PPQLrnmQt5fh0HmEcZx+JU9TZsfCHPnX7MNz4ELfZE6cFsclClrKim3BHUIGq//t93DllB+h4O9LHjEUsQ1Sr63irDLSutkLJD6RXchjROXkNirlcNVHH/jwLWR5RcYilNX7S5bIkK8NlWPjsn/8Ua5O7I9/YoE97PpO6i73DTGLh5H9JN/SITwCKBkgSDWUt61uPK3Y11Gty7o2lWsBjhBUm2Y38CBsoGmBw==' >> ~/.ssh/known_hosts
102-
- go run build/ci.go debsrc -goversion 1.14.2 -upload ethereum/ethereum -sftp-user geth-ci -signer "Go Ethereum Linux Builder <[email protected]>"
112+
- go run build/ci.go debsrc -goversion 1.15 -upload ethereum/ethereum -sftp-user geth-ci -signer "Go Ethereum Linux Builder <[email protected]>"
103113

104114
# This builder does the Linux Azure uploads
105115
- stage: build
106116
if: type = push
107117
os: linux
108118
dist: xenial
109119
sudo: required
110-
go: 1.14.x
120+
go: 1.15.x
111121
env:
112122
- azure-linux
113123
- GO111MODULE=on
@@ -144,7 +154,7 @@ jobs:
144154
dist: xenial
145155
services:
146156
- docker
147-
go: 1.14.x
157+
go: 1.15.x
148158
env:
149159
- azure-linux-mips
150160
- GO111MODULE=on
@@ -192,7 +202,7 @@ jobs:
192202
git:
193203
submodules: false # avoid cloning ethereum/tests
194204
before_install:
195-
- curl https://dl.google.com/go/go1.14.2.linux-amd64.tar.gz | tar -xz
205+
- curl https://dl.google.com/go/go1.15.linux-amd64.tar.gz | tar -xz
196206
- export PATH=`pwd`/go/bin:$PATH
197207
- export GOROOT=`pwd`/go
198208
- export GOPATH=$HOME/go
@@ -210,7 +220,7 @@ jobs:
210220
- stage: build
211221
if: type = push
212222
os: osx
213-
go: 1.14.x
223+
go: 1.15.x
214224
env:
215225
- azure-osx
216226
- azure-ios
@@ -242,7 +252,7 @@ jobs:
242252
if: type = cron
243253
os: linux
244254
dist: xenial
245-
go: 1.14.x
255+
go: 1.15.x
246256
env:
247257
- azure-purge
248258
- GO111MODULE=on

Dockerfile

+1-1
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.14-alpine as builder
2+
FROM golang:1.15-alpine as builder
33

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

Dockerfile.alltools

+1-1
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.14-alpine as builder
2+
FROM golang:1.15-alpine as builder
33

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

appveyor.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ environment:
2424
install:
2525
- git submodule update --init
2626
- rmdir C:\go /s /q
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
27+
- appveyor DownloadFile https://dl.google.com/go/go1.15.windows-%GETH_ARCH%.zip
28+
- 7z x go1.15.windows-%GETH_ARCH%.zip -y -oC:\ > NUL
2929
- go version
3030
- gcc --version
3131

build/checksums.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file contains sha256 checksums of optional build dependencies.
22

3-
98de84e69726a66da7b4e58eac41b99cbe274d7e8906eeb8a5b7eb0aadee7f7c go1.14.2.src.tar.gz
3+
69438f7ed4f532154ffaf878f3dfd83747e7a00b70b3556eddabf7aaee28ac3a go1.15.src.tar.gz
44

55
d998a84eea42f2271aca792a7b027ca5c1edfcba229e8e5a844c9ac3f336df35 golangci-lint-1.27.0-linux-armv7.tar.gz
66
bf781f05b0d393b4bf0a327d9e62926949a4f14d7774d950c4e009fc766ed1d4 golangci-lint.exe-1.27.0-windows-amd64.zip

0 commit comments

Comments
 (0)