Skip to content

Commit 8eb646a

Browse files
authored
Merge pull request #20059 from karalabe/ppa-manual-go
build: switch PPA from Gophers dep to manual download
2 parents 71251c7 + c02d5bc commit 8eb646a

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

build/ci-notes.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,16 @@ variables `PPA_SIGNING_KEY` and `PPA_SSH_KEY` on Travis.
2222

2323
We want to build go-ethereum with the most recent version of Go, irrespective of the Go
2424
version that is available in the main Ubuntu repository. In order to make this possible,
25-
our PPA depends on the ~gophers/ubuntu/archive PPA. Our source package build-depends on
26-
golang-1.11, which is co-installable alongside the regular golang package. PPA dependencies
27-
can be edited at https://launchpad.net/%7Eethereum/+archive/ubuntu/ethereum/+edit-dependencies
25+
our PPA always fetches a recent Go release for the upstream server and uses that.
2826

2927
## Building Packages Locally (for testing)
3028

3129
You need to run Ubuntu to do test packaging.
3230

33-
Add the gophers PPA and install Go 1.11 and Debian packaging tools:
31+
Install Go and the Debian packaging tools:
3432

35-
$ sudo apt-add-repository ppa:gophers/ubuntu/archive
3633
$ sudo apt-get update
37-
$ sudo apt-get install build-essential golang-1.11 devscripts debhelper python-bzrlib python-paramiko
34+
$ sudo apt-get install build-essential golang devscripts debhelper python-bzrlib python-paramiko
3835

3936
Create the source packages:
4037

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
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: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
# Uncomment this to turn on verbose mode.
55
#export DH_VERBOSE=1
66

7-
# Launchpad rejects Go's access to $HOME/.cache, use custom folder
8-
export GOCACHE=/tmp/go-build
7+
# Launchpad rejects Go's access to $HOME, use custom folder
8+
export HOME=/tmp/home
99

1010
override_dh_auto_build:
11-
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}}
11+
go get golang.org/dl/go1.13 && $HOME/go/bin/go1.13 download
12+
build/env.sh $HOME/go/bin/go1.13 run build/ci.go install -git-commit={{.Env.Commit}} -git-branch={{.Env.Branch}} -git-tag={{.Env.Tag}} -buildnum={{.Env.Buildnum}} -pull-request={{.Env.IsPullRequest}}
1213

1314
override_dh_auto_test:
1415

0 commit comments

Comments
 (0)