Skip to content

Commit 1a16cc7

Browse files
authored
Merge pull request #17730 from karalabe/revert-go1.10-ppa
build: revert launchpad PPAs to Go 1.10
2 parents ab13cd9 + b0d6072 commit 1a16cc7

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

build/ci-notes.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ variable which Travis CI makes available to certain builds.
1616
We want to build go-ethereum with the most recent version of Go, irrespective of the Go
1717
version that is available in the main Ubuntu repository. In order to make this possible,
1818
our PPA depends on the ~gophers/ubuntu/archive PPA. Our source package build-depends on
19-
golang-1.11, which is co-installable alongside the regular golang package. PPA dependencies
19+
golang-1.10, which is co-installable alongside the regular golang package. PPA dependencies
2020
can be edited at https://launchpad.net/%7Eethereum/+archive/ubuntu/ethereum/+edit-dependencies
2121

2222
## Building Packages Locally (for testing)
2323

2424
You need to run Ubuntu to do test packaging.
2525

26-
Add the gophers PPA and install Go 1.11 and Debian packaging tools:
26+
Add the gophers PPA and install Go 1.10 and Debian packaging tools:
2727

2828
$ sudo apt-add-repository ppa:gophers/ubuntu/archive
2929
$ sudo apt-get update
30-
$ sudo apt-get install build-essential golang-1.11 devscripts debhelper
30+
$ sudo apt-get install build-essential golang-1.10 devscripts debhelper
3131

3232
Create the source packages:
3333

build/deb/ethereum-swarm/deb.control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Source: {{.Name}}
22
Section: science
33
Priority: extra
44
Maintainer: {{.Author}}
5-
Build-Depends: debhelper (>= 8.0.0), golang-1.11
5+
Build-Depends: debhelper (>= 8.0.0), golang-1.10
66
Standards-Version: 3.9.5
77
Homepage: https://ethereum.org
88
Vcs-Git: git://github.com/ethereum/go-ethereum.git

build/deb/ethereum-swarm/deb.rules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#export DH_VERBOSE=1
66

77
override_dh_auto_build:
8-
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}}
8+
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}}
99

1010
override_dh_auto_test:
1111

build/deb/ethereum/deb.control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Source: {{.Name}}
22
Section: science
33
Priority: extra
44
Maintainer: {{.Author}}
5-
Build-Depends: debhelper (>= 8.0.0), golang-1.11
5+
Build-Depends: debhelper (>= 8.0.0), golang-1.10
66
Standards-Version: 3.9.5
77
Homepage: https://ethereum.org
88
Vcs-Git: git://github.com/ethereum/go-ethereum.git

build/deb/ethereum/deb.rules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#export DH_VERBOSE=1
66

77
override_dh_auto_build:
8-
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}}
8+
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}}
99

1010
override_dh_auto_test:
1111

0 commit comments

Comments
 (0)