Skip to content
This repository was archived by the owner on Oct 23, 2020. It is now read-only.

Commit 24e78c4

Browse files
Merge pull request #196 from PrestaShop/dr-travis
Make Travis great again
2 parents 3e1aced + 59cb816 commit 24e78c4

File tree

2 files changed

+4
-32
lines changed

2 files changed

+4
-32
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ services:
44
- docker
55

66
addons:
7+
chrome: stable
78
apt:
89
packages:
910
- postfix
@@ -19,8 +20,9 @@ env:
1920
- PHP_VERSION=7
2021

2122
before_script:
23+
- chmod a+w -R $TRAVIS_BUILD_DIR
2224
- docker run --name mysql -e MYSQL_ROOT_PASSWORD=admin -d mysql:5.6
23-
- docker run -e DB_SERVER=mysql -e PS_INSTALL_AUTO=0 -e PS_FOLDER_ADMIN=admin-dev -e PS_FOLDER_INSTALL=install-dev -p 80:80 -tid --link mysql --name=prestashop -v $TRAVIS_BUILD_DIR:/var/www/html/themes/StarterTheme prestashop/prestashop-git:$PHP_VERSION
25+
- docker run -e DB_SERVER=mysql -e PS_INSTALL_AUTO=0 -e PS_FOLDER_ADMIN=admin-dev -e PS_FOLDER_INSTALL=install-dev -p 80:80 -tid --link mysql --name=prestashop -v $TRAVIS_BUILD_DIR:/var/www/html/themes/StarterTheme prestashop/prestashop-git:$PHP_VERSION
2426
- docker exec prestashop git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
2527
- docker exec prestashop git fetch origin
2628
- docker exec prestashop git checkout .
@@ -33,14 +35,12 @@ before_script:
3335
- docker exec prestashop php install-dev/index_cli.php --db_create=1 --db_server=mysql --db_password=admin --name=prestashop.unit.test --password=123456789
3436
- docker exec prestashop chown -R www-data:www-data /var/www/html/
3537
- docker cp prestashop:/var/www/html/tests/Selenium selenium
36-
- cp travis-scripts/settings.travis.js selenium/settings.js
37-
- export PATH=$PATH:/usr/lib/jvm/java-8-oracle/jre/bin
38+
- cp selenium/settings.travis.js selenium/settings.js
3839
- cd selenium && npm install --silent
3940
- docker exec prestashop php tests/Selenium/prepare-shop.php
4041
- /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_10.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :10 -ac -screen 0 1600x1200x16
4142
- DISPLAY=:10 node_modules/.bin/selenium-standalone start &> /tmp/selenium.log &
4243
- sleep 5
43-
- export CHROME_BIN=/usr/bin/google-chrome
4444

4545
notifications:
4646
email: false

travis-scripts/settings.travis.js

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)