rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

travis: Clean up Travis scripts

Browse Source
This commit is contained in:
Florian Bruhin 2017-09-10 13:21:03 +02:00
parent e6864b6599
commit 816369f0ef
2 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/dev/ci/travis_install.sh
View File

@ -1,3 +1,4 @@
#!/bin/bash
# vim: ft=sh fileencoding=utf-8 sts=4 sw=4 et: # vim: ft=sh fileencoding=utf-8 sts=4 sw=4 et:
# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org> # Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
@ -42,17 +43,6 @@ travis_retry() {
return $result return $result
} }
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 "$@"
}
brew_install() { brew_install() {
brew update brew update
brew install "$@" brew install "$@"
@ -63,18 +53,6 @@ pip_install() {
travis_retry python -m pip install "$@" travis_retry python -m pip install "$@"
} }
npm_install() {
# Make sure npm is up-to-date first
travis_retry npm install -g npm
travis_retry npm install -g "$@"
}
install_node() {
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() { check_pyqt() {
python3 <<EOF python3 <<EOF
import sys import sys

4
scripts/dev/ci/travis_run.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
if [[ $DOCKER ]]; then if [[ $DOCKER ]]; then
docker run --privileged -v $PWD:/outside -e QUTE_BDD_WEBENGINE=$QUTE_BDD_WEBENGINE -e DOCKER=$DOCKER qutebrowser/travis:$DOCKER docker run --privileged -v "$PWD:/outside" -e "QUTE_BDD_WEBENGINE=$QUTE_BDD_WEBENGINE" -e "DOCKER=$DOCKER" "qutebrowser/travis:$DOCKER"
elif [[ $TESTENV == eslint ]]; then elif [[ $TESTENV == eslint ]]; then
# Can't run this via tox as we can't easily install tox in the javascript travis env # Can't run this via tox as we can't easily install tox in the javascript travis env
cd qutebrowser/javascript || exit 1 cd qutebrowser/javascript || exit 1
@ -10,5 +10,5 @@ else
args=() args=()
[[ $TRAVIS_OS_NAME == osx ]] && args=('--qute-bdd-webengine' '--no-xvfb') [[ $TRAVIS_OS_NAME == osx ]] && args=('--qute-bdd-webengine' '--no-xvfb')
tox -e $TESTENV -- "${args[@]}" tox -e "$TESTENV" -- "${args[@]}"
fi fi