summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2017-06-28 21:42:50 +0200
committerFlorian Bruhin <git@the-compiler.org>2017-06-28 21:42:50 +0200
commita98a6ac0c8eac0a6f55f0b7405bddbf8a8dfbd0e (patch)
tree70a41cd0d688faee7972426580d752c56a35ccd2
parent5ec94f96fd4d5e4c5dbde9c31b12155a11e79d17 (diff)
downloadqutebrowser-a98a6ac0c8eac0a6f55f0b7405bddbf8a8dfbd0e.tar.gz
qutebrowser-a98a6ac0c8eac0a6f55f0b7405bddbf8a8dfbd0e.zip
travis: Write a sane sources.list
Also updates nodejs
-rw-r--r--scripts/dev/ci/travis_install.sh11
1 files changed, 9 insertions, 2 deletions
diff --git a/scripts/dev/ci/travis_install.sh b/scripts/dev/ci/travis_install.sh
index 0ada134c1..9bcb5e07c 100644
--- a/scripts/dev/ci/travis_install.sh
+++ b/scripts/dev/ci/travis_install.sh
@@ -43,6 +43,12 @@ travis_retry() {
}
apt_install() {
+ sudo tee /etc/apt/sources.list <<EOF
+deb http://us.archive.ubuntu.com/ubuntu/ trusty main
+deb http://us.archive.ubuntu.com/ubuntu/ trusty-security main
+deb http://us.archive.ubuntu.com/ubuntu/ trusty-updates main
+EOF
+ sudo rm -rf /etc/apt/sources.list.d
travis_retry sudo apt-get -y -q update
travis_retry sudo apt-get -y -q install --no-install-recommends "$@"
}
@@ -64,8 +70,9 @@ npm_install() {
}
install_node() {
- curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash -
- apt_install nodejs
+ curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
+ travis_retry sudo apt-get -y -q update
+ travis_retry sudo apt-get -y -q install --no-install-recommends nodejs
}
check_pyqt() {