From 669aba8e2c630f1dc744c86dc01de7c0f79e417d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Mon, 19 Feb 2018 11:04:26 +0200
Subject: [PATCH] travis, Dockerfile, appveyor, build: bump to Go 1.10
---
.travis.yml | 27 +++++++++++++++++++--------
Dockerfile | 2 +-
Dockerfile.alltools | 2 +-
appveyor.yml | 4 ++--
build/ci-notes.md | 13 ++++---------
build/deb.control | 2 +-
build/deb.rules | 2 +-
7 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a76a78954d..b3757ff7d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,6 @@ matrix:
- go run build/ci.go install
- go run build/ci.go test -coverage
- # These are the latest Go versions.
- os: linux
dist: trusty
sudo: required
@@ -26,8 +25,20 @@ matrix:
- go run build/ci.go install
- go run build/ci.go test -coverage
+ # These are the latest Go versions.
+ - os: linux
+ dist: trusty
+ sudo: required
+ go: "1.10"
+ script:
+ - sudo modprobe fuse
+ - sudo chmod 666 /dev/fuse
+ - sudo chown root:$USER /etc/fuse.conf
+ - go run build/ci.go install
+ - go run build/ci.go test -coverage
+
- os: osx
- go: 1.9.x
+ go: "1.10"
script:
- unset -f cd # workaround for https://github.com/travis-ci/travis-ci/issues/8703
- brew update
@@ -39,7 +50,7 @@ matrix:
# This builder only tests code linters on latest version of Go
- os: linux
dist: trusty
- go: 1.9.x
+ go: "1.10"
env:
- lint
git:
@@ -51,7 +62,7 @@ matrix:
- os: linux
dist: trusty
sudo: required
- go: 1.9.x
+ go: "1.10"
env:
- ubuntu-ppa
- azure-linux
@@ -91,7 +102,7 @@ matrix:
dist: trusty
services:
- docker
- go: 1.9.x
+ go: "1.10"
env:
- azure-linux-mips
git:
@@ -135,7 +146,7 @@ matrix:
git:
submodules: false # avoid cloning ethereum/tests
before_install:
- - curl https://storage.googleapis.com/golang/go1.9.2.linux-amd64.tar.gz | tar -xz
+ - curl https://storage.googleapis.com/golang/go1.10.linux-amd64.tar.gz | tar -xz
- export PATH=`pwd`/go/bin:$PATH
- export GOROOT=`pwd`/go
- export GOPATH=$HOME/go
@@ -152,7 +163,7 @@ matrix:
# This builder does the OSX Azure, iOS CocoaPods and iOS Azure uploads
- os: osx
- go: 1.9.x
+ go: "1.10"
env:
- azure-osx
- azure-ios
@@ -182,7 +193,7 @@ matrix:
- os: linux
dist: trusty
sudo: required
- go: 1.9.x
+ go: "1.10"
env:
- azure-purge
git:
diff --git a/Dockerfile b/Dockerfile
index f4396fcf28..29cdc80f96 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
# Build Geth in a stock Go builder container
-FROM golang:1.9-alpine as builder
+FROM golang:1.10-alpine as builder
RUN apk add --no-cache make gcc musl-dev linux-headers
diff --git a/Dockerfile.alltools b/Dockerfile.alltools
index 79bf0f8d56..1047738d25 100644
--- a/Dockerfile.alltools
+++ b/Dockerfile.alltools
@@ -1,5 +1,5 @@
# Build Geth in a stock Go builder container
-FROM golang:1.9-alpine as builder
+FROM golang:1.10-alpine as builder
RUN apk add --no-cache make gcc musl-dev linux-headers
diff --git a/appveyor.yml b/appveyor.yml
index 99029f553d..45475d1669 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,8 +23,8 @@ environment:
install:
- git submodule update --init
- rmdir C:\go /s /q
- - appveyor DownloadFile https://storage.googleapis.com/golang/go1.9.2.windows-%GETH_ARCH%.zip
- - 7z x go1.9.2.windows-%GETH_ARCH%.zip -y -oC:\ > NUL
+ - appveyor DownloadFile https://storage.googleapis.com/golang/go1.10.windows-%GETH_ARCH%.zip
+ - 7z x go1.10.windows-%GETH_ARCH%.zip -y -oC:\ > NUL
- go version
- gcc --version
diff --git a/build/ci-notes.md b/build/ci-notes.md
index 78e9575c01..f5b0e869d6 100644
--- a/build/ci-notes.md
+++ b/build/ci-notes.md
@@ -2,12 +2,7 @@
Tagged releases and develop branch commits are available as installable Debian packages
for Ubuntu. Packages are built for the all Ubuntu versions which are supported by
-Canonical:
-
-- Trusty Tahr (14.04 LTS)
-- Xenial Xerus (16.04 LTS)
-- Yakkety Yak (16.10)
-- Zesty Zapus (17.04)
+Canonical.
Packages of develop branch commits have suffix -unstable and cannot be installed alongside
the stable version. Switching between release streams requires user intervention.
@@ -21,18 +16,18 @@ variable which Travis CI makes available to certain builds.
We want to build go-ethereum with the most recent version of Go, irrespective of the Go
version that is available in the main Ubuntu repository. In order to make this possible,
our PPA depends on the ~gophers/ubuntu/archive PPA. Our source package build-depends on
-golang-1.9, which is co-installable alongside the regular golang package. PPA dependencies
+golang-1.10, which is co-installable alongside the regular golang package. PPA dependencies
can be edited at https://launchpad.net/%7Eethereum/+archive/ubuntu/ethereum/+edit-dependencies
## Building Packages Locally (for testing)
You need to run Ubuntu to do test packaging.
-Add the gophers PPA and install Go 1.9 and Debian packaging tools:
+Add the gophers PPA and install Go 1.10 and Debian packaging tools:
$ sudo apt-add-repository ppa:gophers/ubuntu/archive
$ sudo apt-get update
- $ sudo apt-get install build-essential golang-1.9 devscripts debhelper
+ $ sudo apt-get install build-essential golang-1.10 devscripts debhelper
Create the source packages:
diff --git a/build/deb.control b/build/deb.control
index 5c9ce6705c..33c1a779f4 100644
--- a/build/deb.control
+++ b/build/deb.control
@@ -2,7 +2,7 @@ Source: {{.Name}}
Section: science
Priority: extra
Maintainer: {{.Author}}
-Build-Depends: debhelper (>= 8.0.0), golang-1.9
+Build-Depends: debhelper (>= 8.0.0), golang-1.10
Standards-Version: 3.9.5
Homepage: https://ethereum.org
Vcs-Git: git://github.com/ethereum/go-ethereum.git
diff --git a/build/deb.rules b/build/deb.rules
index 7a78525139..7f286569ea 100644
--- a/build/deb.rules
+++ b/build/deb.rules
@@ -5,7 +5,7 @@
#export DH_VERBOSE=1
override_dh_auto_build:
- build/env.sh /usr/lib/go-1.9/bin/go run build/ci.go install -git-commit={{.Env.Commit}} -git-branch={{.Env.Branch}} -git-tag={{.Env.Tag}} -buildnum={{.Env.Buildnum}} -pull-request={{.Env.IsPullRequest}}
+ build/env.sh /usr/lib/go-1.10/bin/go run build/ci.go install -git-commit={{.Env.Commit}} -git-branch={{.Env.Branch}} -git-tag={{.Env.Tag}} -buildnum={{.Env.Buildnum}} -pull-request={{.Env.IsPullRequest}}
override_dh_auto_test:
--
GitLab