浏览代码

Merge pull request #20059 from karalabe/ppa-manual-go

build: switch PPA from Gophers dep to manual download
Péter Szilágyi 6 年之前
父节点
当前提交
8eb646a96d
共有 3 个文件被更改,包括 8 次插入10 次删除
  1. 3 6
      build/ci-notes.md
  2. 1 1
      build/deb/ethereum/deb.control
  3. 4 3
      build/deb/ethereum/deb.rules

+ 3 - 6
build/ci-notes.md

@@ -22,19 +22,16 @@ 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
 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,
 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
-can be edited at https://launchpad.net/%7Eethereum/+archive/ubuntu/ethereum/+edit-dependencies
+our PPA always fetches a recent Go release for the upstream server and uses that.
 
 
 ## Building Packages Locally (for testing)
 ## Building Packages Locally (for testing)
 
 
 You need to run Ubuntu to do test packaging.
 You need to run Ubuntu to do test packaging.
 
 
-Add the gophers PPA and install Go 1.11 and Debian packaging tools:
+Install Go and the Debian packaging tools:
 
 
-    $ sudo apt-add-repository ppa:gophers/ubuntu/archive
     $ sudo apt-get update
     $ sudo apt-get update
-    $ sudo apt-get install build-essential golang-1.11 devscripts debhelper python-bzrlib python-paramiko
+    $ sudo apt-get install build-essential golang devscripts debhelper python-bzrlib python-paramiko
 
 
 Create the source packages:
 Create the source packages:
 
 

+ 1 - 1
build/deb/ethereum/deb.control

@@ -2,7 +2,7 @@ Source: {{.Name}}
 Section: science
 Section: science
 Priority: extra
 Priority: extra
 Maintainer: {{.Author}}
 Maintainer: {{.Author}}
-Build-Depends: debhelper (>= 8.0.0), golang-1.11
+Build-Depends: debhelper (>= 8.0.0), golang
 Standards-Version: 3.9.5
 Standards-Version: 3.9.5
 Homepage: https://ethereum.org
 Homepage: https://ethereum.org
 Vcs-Git: git://github.com/ethereum/go-ethereum.git
 Vcs-Git: git://github.com/ethereum/go-ethereum.git

+ 4 - 3
build/deb/ethereum/deb.rules

@@ -4,11 +4,12 @@
 # Uncomment this to turn on verbose mode.
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 #export DH_VERBOSE=1
 
 
-# Launchpad rejects Go's access to $HOME/.cache, use custom folder
-export GOCACHE=/tmp/go-build
+# Launchpad rejects Go's access to $HOME, use custom folder
+export HOME=/tmp/home
 
 
 override_dh_auto_build:
 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}}
+	go get golang.org/dl/go1.13 && $HOME/go/bin/go1.13 download
+	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}}
 
 
 override_dh_auto_test:
 override_dh_auto_test: