From 15fdaf20055323874a05bcae780014fb99e7cffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Thu, 20 Aug 2020 16:41:37 +0300
Subject: [PATCH] travis, dockerfile, appveyor, build: bump to Go 1.15
---
.travis.yml | 32 +++++++++++++++++++++-----------
Dockerfile | 2 +-
Dockerfile.alltools | 2 +-
appveyor.yml | 4 ++--
build/checksums.txt | 2 +-
5 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 1b61667c8..245f52b36 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ jobs:
- stage: lint
os: linux
dist: xenial
- go: 1.14.x
+ go: 1.15.x
env:
- lint
git:
@@ -34,12 +34,22 @@ jobs:
- go run build/ci.go install
- go run build/ci.go test -coverage $TEST_PACKAGES
+ - stage: build
+ os: linux
+ dist: xenial
+ go: 1.14.x
+ env:
+ - GO111MODULE=on
+ script:
+ - go run build/ci.go install
+ - go run build/ci.go test -coverage $TEST_PACKAGES
+
# These are the latest Go versions.
- stage: build
os: linux
arch: amd64
dist: xenial
- go: 1.14.x
+ go: 1.15.x
env:
- GO111MODULE=on
script:
@@ -51,7 +61,7 @@ jobs:
os: linux
arch: arm64
dist: xenial
- go: 1.14.x
+ go: 1.15.x
env:
- GO111MODULE=on
script:
@@ -61,7 +71,7 @@ jobs:
- stage: build
os: osx
osx_image: xcode11.3
- go: 1.14.x
+ go: 1.15.x
env:
- GO111MODULE=on
script:
@@ -82,7 +92,7 @@ jobs:
if: type = push
os: linux
dist: xenial
- go: 1.14.x
+ go: 1.15.x
env:
- ubuntu-ppa
- GO111MODULE=on
@@ -99,7 +109,7 @@ jobs:
- python-paramiko
script:
- echo '|1|7SiYPr9xl3uctzovOTj4gMwAC1M=|t6ReES75Bo/PxlOPJ6/GsGbTrM0= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0aKz5UTUndYgIGG7dQBV+HaeuEZJ2xPHo2DS2iSKvUL4xNMSAY4UguNW+pX56nAQmZKIZZ8MaEvSj6zMEDiq6HFfn5JcTlM80UwlnyKe8B8p7Nk06PPQLrnmQt5fh0HmEcZx+JU9TZsfCHPnX7MNz4ELfZE6cFsclClrKim3BHUIGq//t93DllB+h4O9LHjEUsQ1Sr63irDLSutkLJD6RXchjROXkNirlcNVHH/jwLWR5RcYilNX7S5bIkK8NlWPjsn/8Ua5O7I9/YoE97PpO6i73DTGLh5H9JN/SITwCKBkgSDWUt61uPK3Y11Gty7o2lWsBjhBUm2Y38CBsoGmBw==' >> ~/.ssh/known_hosts
- - go run build/ci.go debsrc -goversion 1.14.2 -upload ethereum/ethereum -sftp-user geth-ci -signer "Go Ethereum Linux Builder <geth-ci@ethereum.org>"
+ - go run build/ci.go debsrc -goversion 1.15 -upload ethereum/ethereum -sftp-user geth-ci -signer "Go Ethereum Linux Builder <geth-ci@ethereum.org>"
# This builder does the Linux Azure uploads
- stage: build
@@ -107,7 +117,7 @@ jobs:
os: linux
dist: xenial
sudo: required
- go: 1.14.x
+ go: 1.15.x
env:
- azure-linux
- GO111MODULE=on
@@ -144,7 +154,7 @@ jobs:
dist: xenial
services:
- docker
- go: 1.14.x
+ go: 1.15.x
env:
- azure-linux-mips
- GO111MODULE=on
@@ -192,7 +202,7 @@ jobs:
git:
submodules: false # avoid cloning ethereum/tests
before_install:
- - curl https://dl.google.com/go/go1.14.2.linux-amd64.tar.gz | tar -xz
+ - curl https://dl.google.com/go/go1.15.linux-amd64.tar.gz | tar -xz
- export PATH=`pwd`/go/bin:$PATH
- export GOROOT=`pwd`/go
- export GOPATH=$HOME/go
@@ -210,7 +220,7 @@ jobs:
- stage: build
if: type = push
os: osx
- go: 1.14.x
+ go: 1.15.x
env:
- azure-osx
- azure-ios
@@ -242,7 +252,7 @@ jobs:
if: type = cron
os: linux
dist: xenial
- go: 1.14.x
+ go: 1.15.x
env:
- azure-purge
- GO111MODULE=on
diff --git a/Dockerfile b/Dockerfile
index 54453c4df..0705361f5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
# Build Geth in a stock Go builder container
-FROM golang:1.14-alpine as builder
+FROM golang:1.15-alpine as builder
RUN apk add --no-cache make gcc musl-dev linux-headers git
diff --git a/Dockerfile.alltools b/Dockerfile.alltools
index 9c28979a1..e2604232c 100644
--- a/Dockerfile.alltools
+++ b/Dockerfile.alltools
@@ -1,5 +1,5 @@
# Build Geth in a stock Go builder container
-FROM golang:1.14-alpine as builder
+FROM golang:1.15-alpine as builder
RUN apk add --no-cache make gcc musl-dev linux-headers git
diff --git a/appveyor.yml b/appveyor.yml
index fe15cc7f0..7d6bf8763 100644
--- 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.14.2.windows-%GETH_ARCH%.zip
- - 7z x go1.14.2.windows-%GETH_ARCH%.zip -y -oC:\ > NUL
+ - appveyor DownloadFile https://dl.google.com/go/go1.15.windows-%GETH_ARCH%.zip
+ - 7z x go1.15.windows-%GETH_ARCH%.zip -y -oC:\ > NUL
- go version
- gcc --version
diff --git a/build/checksums.txt b/build/checksums.txt
index c4b276e34..39f855cd0 100644
--- a/build/checksums.txt
+++ b/build/checksums.txt
@@ -1,6 +1,6 @@
# This file contains sha256 checksums of optional build dependencies.
-98de84e69726a66da7b4e58eac41b99cbe274d7e8906eeb8a5b7eb0aadee7f7c go1.14.2.src.tar.gz
+69438f7ed4f532154ffaf878f3dfd83747e7a00b70b3556eddabf7aaee28ac3a go1.15.src.tar.gz
d998a84eea42f2271aca792a7b027ca5c1edfcba229e8e5a844c9ac3f336df35 golangci-lint-1.27.0-linux-armv7.tar.gz
bf781f05b0d393b4bf0a327d9e62926949a4f14d7774d950c4e009fc766ed1d4 golangci-lint.exe-1.27.0-windows-amd64.zip
--
GitLab