aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-09-05 16:16:46 +0800
committerFelix Lange <fjl@users.noreply.github.com>2017-09-05 16:16:46 +0800
commit504278e8398ef787d4f6f73178afa342a31a88ed (patch)
treeadca4aabed40dd70242766cea037b81eefe76343
parente7408b5552002df7c3ba6a2351f14c533dfc5a36 (diff)
downloaddexon-504278e8398ef787d4f6f73178afa342a31a88ed.tar
dexon-504278e8398ef787d4f6f73178afa342a31a88ed.tar.gz
dexon-504278e8398ef787d4f6f73178afa342a31a88ed.tar.bz2
dexon-504278e8398ef787d4f6f73178afa342a31a88ed.tar.lz
dexon-504278e8398ef787d4f6f73178afa342a31a88ed.tar.xz
dexon-504278e8398ef787d4f6f73178afa342a31a88ed.tar.zst
dexon-504278e8398ef787d4f6f73178afa342a31a88ed.zip
build: bump PPA builders to Go 1.9 (#15083)
-rw-r--r--build/ci-notes.md6
-rw-r--r--build/deb.control2
-rw-r--r--build/deb.rules2
3 files changed, 5 insertions, 5 deletions
diff --git a/build/ci-notes.md b/build/ci-notes.md
index 7574bfffa..78e9575c0 100644
--- a/build/ci-notes.md
+++ b/build/ci-notes.md
@@ -21,18 +21,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.8, which is co-installable alongside the regular golang package. PPA dependencies
+golang-1.9, 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.8 and Debian packaging tools:
+Add the gophers PPA and install Go 1.9 and Debian packaging tools:
$ sudo apt-add-repository ppa:gophers/ubuntu/archive
$ sudo apt-get update
- $ sudo apt-get install build-essential golang-1.8 devscripts debhelper
+ $ sudo apt-get install build-essential golang-1.9 devscripts debhelper
Create the source packages:
diff --git a/build/deb.control b/build/deb.control
index 7394754ef..5c9ce6705 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.8
+Build-Depends: debhelper (>= 8.0.0), golang-1.9
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 b3fe5267f..7a7852513 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.8/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.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}}
override_dh_auto_test: