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.
This commit is contained in:
Felix Lange 2018-03-28 14:35:41 +02:00 committed by Péter Szilágyi
parent 1a8894b3d5
commit a095b84ec5
1 changed files with 17 additions and 6 deletions

View File

@ -47,14 +47,12 @@ matrix:
script: script:
- go run build/ci.go lint - 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 - os: linux
dist: trusty dist: trusty
sudo: required
go: "1.10" go: "1.10"
env: env:
- ubuntu-ppa - ubuntu-ppa
- azure-linux
git: git:
submodules: false # avoid cloning ethereum/tests submodules: false # avoid cloning ethereum/tests
addons: addons:
@ -63,11 +61,25 @@ matrix:
- devscripts - devscripts
- debhelper - debhelper
- dput - dput
- gcc-multilib
- fakeroot - fakeroot
script: 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 - 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 install
- go run build/ci.go archive -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds - go run build/ci.go archive -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
- go run build/ci.go install -arch 386 - go run build/ci.go install -arch 386
@ -181,7 +193,6 @@ matrix:
# This builder does the Azure archive purges to avoid accumulating junk # This builder does the Azure archive purges to avoid accumulating junk
- os: linux - os: linux
dist: trusty dist: trusty
sudo: required
go: "1.10" go: "1.10"
env: env:
- azure-purge - azure-purge