aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2019-02-26 18:30:55 +0800
committerGitHub <noreply@github.com>2019-02-26 18:30:55 +0800
commita42afa766c30de484a8b86419995ac90a53f0272 (patch)
treea9855df00877a4240c93edca0c521925e03e28c4
parentc83ba9e7941a0a97e20922e04ef403e52d885017 (diff)
parent647692fbfe5a524c11211a7d4c5c4e1d78f4048f (diff)
downloadgo-tangerine-a42afa766c30de484a8b86419995ac90a53f0272.tar
go-tangerine-a42afa766c30de484a8b86419995ac90a53f0272.tar.gz
go-tangerine-a42afa766c30de484a8b86419995ac90a53f0272.tar.bz2
go-tangerine-a42afa766c30de484a8b86419995ac90a53f0272.tar.lz
go-tangerine-a42afa766c30de484a8b86419995ac90a53f0272.tar.xz
go-tangerine-a42afa766c30de484a8b86419995ac90a53f0272.tar.zst
go-tangerine-a42afa766c30de484a8b86419995ac90a53f0272.zip
Merge pull request #19169 from karalabe/ppa-bump
build: bump PPA builders to Go 1.11
-rw-r--r--build/ci-notes.md6
-rw-r--r--build/deb/ethereum-swarm/deb.control2
-rw-r--r--build/deb/ethereum-swarm/deb.rules2
-rw-r--r--build/deb/ethereum/deb.control2
-rw-r--r--build/deb/ethereum/deb.rules2
5 files changed, 7 insertions, 7 deletions
diff --git a/build/ci-notes.md b/build/ci-notes.md
index ba27cdb1d..13e1fd230 100644
--- a/build/ci-notes.md
+++ b/build/ci-notes.md
@@ -23,18 +23,18 @@ variables `PPA_SIGNING_KEY` and `PPA_SSH_KEY` on Travis.
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.10, which is co-installable alongside the regular golang package. PPA dependencies
+golang-1.11, 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.10 and Debian packaging tools:
+Add the gophers PPA and install Go 1.11 and Debian packaging tools:
$ sudo apt-add-repository ppa:gophers/ubuntu/archive
$ sudo apt-get update
- $ sudo apt-get install build-essential golang-1.10 devscripts debhelper python-bzrlib python-paramiko
+ $ sudo apt-get install build-essential golang-1.11 devscripts debhelper python-bzrlib python-paramiko
Create the source packages:
diff --git a/build/deb/ethereum-swarm/deb.control b/build/deb/ethereum-swarm/deb.control
index 8cd325bf5..b0ced141b 100644
--- a/build/deb/ethereum-swarm/deb.control
+++ b/build/deb/ethereum-swarm/deb.control
@@ -2,7 +2,7 @@ Source: {{.Name}}
Section: science
Priority: extra
Maintainer: {{.Author}}
-Build-Depends: debhelper (>= 8.0.0), golang-1.10
+Build-Depends: debhelper (>= 8.0.0), golang-1.11
Standards-Version: 3.9.5
Homepage: https://ethereum.org
Vcs-Git: git://github.com/ethereum/go-ethereum.git
diff --git a/build/deb/ethereum-swarm/deb.rules b/build/deb/ethereum-swarm/deb.rules
index 7f286569e..98e2ab030 100644
--- a/build/deb/ethereum-swarm/deb.rules
+++ b/build/deb/ethereum-swarm/deb.rules
@@ -5,7 +5,7 @@
#export DH_VERBOSE=1
override_dh_auto_build:
- 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}}
+ build/env.sh /usr/lib/go-1.11/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:
diff --git a/build/deb/ethereum/deb.control b/build/deb/ethereum/deb.control
index defb106fe..018067a19 100644
--- a/build/deb/ethereum/deb.control
+++ b/build/deb/ethereum/deb.control
@@ -2,7 +2,7 @@ Source: {{.Name}}
Section: science
Priority: extra
Maintainer: {{.Author}}
-Build-Depends: debhelper (>= 8.0.0), golang-1.10
+Build-Depends: debhelper (>= 8.0.0), golang-1.11
Standards-Version: 3.9.5
Homepage: https://ethereum.org
Vcs-Git: git://github.com/ethereum/go-ethereum.git
diff --git a/build/deb/ethereum/deb.rules b/build/deb/ethereum/deb.rules
index 7f286569e..98e2ab030 100644
--- a/build/deb/ethereum/deb.rules
+++ b/build/deb/ethereum/deb.rules
@@ -5,7 +5,7 @@
#export DH_VERBOSE=1
override_dh_auto_build:
- 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}}
+ build/env.sh /usr/lib/go-1.11/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: