aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2018-09-21 17:34:22 +0800
committerGitHub <noreply@github.com>2018-09-21 17:34:22 +0800
commit1a16cc71c68e4af86329fc95286152b71f98d0b1 (patch)
treead7ef408ce8e5584fb1b89cc3087ffeb8dccdbee
parentab13cd992405f84dc48b7d49b54c5de06a7cd5ab (diff)
parentb0d60721f16077caf4fcd192cc467968cb031d2c (diff)
downloadgo-tangerine-1a16cc71c68e4af86329fc95286152b71f98d0b1.tar
go-tangerine-1a16cc71c68e4af86329fc95286152b71f98d0b1.tar.gz
go-tangerine-1a16cc71c68e4af86329fc95286152b71f98d0b1.tar.bz2
go-tangerine-1a16cc71c68e4af86329fc95286152b71f98d0b1.tar.lz
go-tangerine-1a16cc71c68e4af86329fc95286152b71f98d0b1.tar.xz
go-tangerine-1a16cc71c68e4af86329fc95286152b71f98d0b1.tar.zst
go-tangerine-1a16cc71c68e4af86329fc95286152b71f98d0b1.zip
Merge pull request #17730 from karalabe/revert-go1.10-ppa
build: revert launchpad PPAs to Go 1.10
-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 a6bb32581..f5b0e869d 100644
--- a/build/ci-notes.md
+++ b/build/ci-notes.md
@@ -16,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.11, 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.11 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.11 devscripts debhelper
+ $ sudo apt-get install build-essential golang-1.10 devscripts debhelper
Create the source packages:
diff --git a/build/deb/ethereum-swarm/deb.control b/build/deb/ethereum-swarm/deb.control
index b0ced141b..8cd325bf5 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.11
+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/ethereum-swarm/deb.rules b/build/deb/ethereum-swarm/deb.rules
index 98e2ab030..7f286569e 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.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}}
+ 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:
diff --git a/build/deb/ethereum/deb.control b/build/deb/ethereum/deb.control
index 018067a19..defb106fe 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.11
+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/ethereum/deb.rules b/build/deb/ethereum/deb.rules
index 98e2ab030..7f286569e 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.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}}
+ 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: