aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Lange <fjl@users.noreply.github.com>2018-03-28 20:35:41 +0800
committerPéter Szilágyi <peterke@gmail.com>2018-03-28 20:35:41 +0800
commita095b84ec5a35cb3432380cc677d4e244b4a137f (patch)
tree37dabe42363677820b20b6bc9ddee0b09cc6127b
parent1a8894b3d59bdf592244b91b6a629f7cf25dcdde (diff)
downloaddexon-a095b84ec5a35cb3432380cc677d4e244b4a137f.tar.gz
dexon-a095b84ec5a35cb3432380cc677d4e244b4a137f.tar.zst
dexon-a095b84ec5a35cb3432380cc677d4e244b4a137f.zip
travis.yml: remove sudo requirement for PPA and Azure purge builders (#16404)
This is supposed to fix the FTP upload issue according to travis-ci/travis-ci#9391.
-rw-r--r--.travis.yml23
1 files changed, 17 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index cade11700..40d940de0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,14 +47,12 @@ matrix:
script:
- go run build/ci.go lint
- # This builder does the Ubuntu PPA and Linux Azure uploads
+ # This builder does the Ubuntu PPA upload
- os: linux
dist: trusty
- sudo: required
go: "1.10"
env:
- ubuntu-ppa
- - azure-linux
git:
submodules: false # avoid cloning ethereum/tests
addons:
@@ -63,11 +61,25 @@ matrix:
- devscripts
- debhelper
- dput
- - gcc-multilib
- fakeroot
script:
- # Build for the primary platforms that Trusty can manage
- go run build/ci.go debsrc -signer "Go Ethereum Linux Builder <geth-ci@ethereum.org>" -upload ppa:ethereum/ethereum
+
+ # This builder does the Linux Azure uploads
+ - os: linux
+ dist: trusty
+ sudo: required
+ go: "1.10"
+ env:
+ - azure-linux
+ git:
+ submodules: false # avoid cloning ethereum/tests
+ addons:
+ apt:
+ packages:
+ - gcc-multilib
+ script:
+ # Build for the primary platforms that Trusty can manage
- go run build/ci.go install
- go run build/ci.go archive -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
- go run build/ci.go install -arch 386
@@ -181,7 +193,6 @@ matrix:
# This builder does the Azure archive purges to avoid accumulating junk
- os: linux
dist: trusty
- sudo: required
go: "1.10"
env:
- azure-purge