Skip to content

Commit

Permalink
Simplify .travis.yml in order to adopt debootstrap
Browse files Browse the repository at this point in the history
  • Loading branch information
evilaliv3 committed May 24, 2018
1 parent 55a7c57 commit dc7aed9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 19 deletions.
9 changes: 0 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,6 @@ matrix:
- env: GLTEST='end2end-10' BROWSER='iphone 8.0'
- env: GLTEST='end2end-11' BROWSER='iphone 11.0'

before_install:
- nvm install 6.11
- nvm use 6.11
- export CHROME_BIN=/usr/bin/google-chrome
- export DISPLAY=:99.0
- sudo apt-get install -y libappindicator1 fonts-liberation
- wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
- sudo dpkg -i google-chrome*.deb
- /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16
install: true
script:
- $TRAVIS_BUILD_DIR/scripts/travis.sh
14 changes: 4 additions & 10 deletions scripts/travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

if [ -z "$GLREQUIREMENTS" ]; then
GLREQUIREMENTS="trusty"
GLREQUIREMENTS="xenial"
fi

TRAVIS_USR="travis-$(git rev-parse --short HEAD)"
Expand Down Expand Up @@ -97,7 +97,7 @@ elif [ "$GLTEST" = "build_and_install" ]; then
trap atexit EXIT

echo "Running Build & Install and BrowserTesting tests"
# we build all packages to test build for each distributions and then we test against trusty
# we build all packages to test build for each distributions and then we test against xenial
sudo apt-get update -y
sudo apt-get install -y debhelper devscripts dh-apparmor dh-python python python-pip python-setuptools python-sphinx
curl -sL https://deb.nodesource.com/setup | sudo bash -
Expand All @@ -106,8 +106,8 @@ elif [ "$GLTEST" = "build_and_install" ]; then
sed -ie 's/key_bits = 2048/key_bits = 512/g' backend/globaleaks/settings.py
sed -ie 's/csr_sign_bits = 512/csr_sign_bits = 256/g' backend/globaleaks/settings.py
rm debian/control backend/requirements.txt
cp debian/controlX/control.trusty debian/control
cp backend/requirements/requirements-trusty.txt backend/requirements.txt
cp debian/controlX/control.xenial debian/control
cp backend/requirements/requirements-xenial.txt backend/requirements.txt
cd client
npm install grunt-cli
npm install
Expand All @@ -117,11 +117,6 @@ elif [ "$GLTEST" = "build_and_install" ]; then
sudo mkdir -p /globaleaks/deb/
sudo cp ../globaleaks*deb /globaleaks/deb/
sudo ./scripts/install.sh --assume-yes --test
setupClientDependencies
cd $TRAVIS_BUILD_DIR/client

node_modules/protractor/bin/webdriver-manager update --gecko=false
node_modules/protractor/bin/protractor tests/end2end/protractor.config.js

elif [[ $GLTEST =~ ^end2end-.* ]]; then

Expand Down Expand Up @@ -154,5 +149,4 @@ elif [[ $GLTEST =~ ^end2end-.* ]]; then
sleep 5
cd $TRAVIS_BUILD_DIR/client
node_modules/protractor/bin/protractor tests/end2end/protractor-sauce.config.js

fi

0 comments on commit dc7aed9

Please sign in to comment.