From dfa97cad6b8a0d58d234602a0dbecc00bf5fc201 Mon Sep 17 00:00:00 2001 From: Stefan Doorn Date: Tue, 30 Jan 2018 17:55:37 +0100 Subject: [PATCH 1/5] Install recent version of Yarn --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0bb5541bc..fc1471018 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ before_install: - sudo apt-key adv --fetch-keys http://dl.yarnpkg.com/debian/pubkey.gpg - echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list - sudo apt-get update -qq - - sudo apt-get install -y -qq yarn=0.21.3-1 + - sudo apt-get install -y -qq yarn install: - composer update --prefer-dist From e776d5eb410a32d1e45ff584036bf3627724098e Mon Sep 17 00:00:00 2001 From: Stefan Doorn Date: Sat, 27 Jan 2018 11:11:08 +0100 Subject: [PATCH 2/5] Add PHP 7.2 to test matrix --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index fc1471018..2a7e76a5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ sudo: required php: - 7.1 + - 7.2 cache: directories: From 307b74aabcaf9c75a98c325aaec7a5ea5532ba7b Mon Sep 17 00:00:00 2001 From: Stefan Doorn Date: Mon, 22 Jan 2018 15:36:12 -0100 Subject: [PATCH 3/5] Sync package.json with Sylius version --- tests/Application/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Application/package.json b/tests/Application/package.json index eb2a6a0ac..5ff7009ce 100644 --- a/tests/Application/package.json +++ b/tests/Application/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "jquery": "^2.2.0", + "jquery": "^3.2.0", "lightbox2": "^2.9.0", "semantic-ui-css": "^2.2.0" }, @@ -17,6 +17,7 @@ "gulp-uglify": "^1.5.1", "gulp-uglifycss": "^1.0.5", "merge-stream": "^1.0.0", + "node-sass": "^4.5.3", "yargs": "^6.4.0" }, "scripts": { From 904221535d29487231fc122207c7daafb08237b0 Mon Sep 17 00:00:00 2001 From: Lukas Kahwe Smith Date: Fri, 12 Jan 2018 15:55:58 +0100 Subject: [PATCH 4/5] fix ! rules in .gitignore files --- .gitignore | 2 +- tests/Application/.gitignore | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dd32eea0a..c8c442b22 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -/bin/ +/bin/* !/bin/.gitkeep /vendor/ diff --git a/tests/Application/.gitignore b/tests/Application/.gitignore index 28329e50c..169564f58 100644 --- a/tests/Application/.gitignore +++ b/tests/Application/.gitignore @@ -1,8 +1,9 @@ /node_modules/ -/var/ +/var/* !/var/.gitkeep -/web/ +/web/* +!/web/app.php !/web/app_dev.php !/web/app_test.php From 60954be1e59365c8b7bea33149e66c75405ac4f8 Mon Sep 17 00:00:00 2001 From: Kamil Kokot Date: Wed, 31 Jan 2018 11:30:17 +0100 Subject: [PATCH 5/5] Make Travis passing again --- .travis.yml | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2a7e76a5e..fc81cb9e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,44 +2,36 @@ language: php dist: trusty -sudo: required +sudo: false php: - 7.1 - 7.2 cache: + yarn: true directories: - ~/.composer/cache/files - $SYLIUS_CACHE_DIR - yarn: true env: global: - SYLIUS_CACHE_DIR=$HOME/.sylius-cache - SYLIUS_BUILD_DIR=etc/build - - TRAVIS_NODE_VERSION="7.5" before_install: - - phpenv config-rm xdebug.ini || true + - phpenv config-rm xdebug.ini - echo "memory_limit=4096M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - - # Install Node Version Manager to install newer node version - - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout $(git describe --abbrev=0 --tags)) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION - - # Install Yarn globally - - sudo apt-key adv --fetch-keys http://dl.yarnpkg.com/debian/pubkey.gpg - - echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list - - sudo apt-get update -qq - - sudo apt-get install -y -qq yarn + - mkdir -p "${SYLIUS_CACHE_DIR}" install: - - composer update --prefer-dist + - composer install --no-interaction --prefer-dist - (cd tests/Application && yarn install) before_script: - - (cd tests/Application && bin/console doctrine:schema:create --env=test) - - (cd tests/Application && bin/console assets:install web --env=test) + - (cd tests/Application && bin/console doctrine:database:create --env=test -vvv) + - (cd tests/Application && bin/console doctrine:schema:create --env=test -vvv) + - (cd tests/Application && bin/console assets:install web --env=test -vvv) - (cd tests/Application && yarn run gulp) # Configure display @@ -48,8 +40,8 @@ before_script: # Download and configure ChromeDriver - | - if [ ! -f $SYLIUS_CACHE_DIR/chromedriver ]; then - curl http://chromedriver.storage.googleapis.com/2.35/chromedriver_linux64.zip > chromedriver.zip + if [ ! -f $SYLIUS_CACHE_DIR/chromedriver ] || [ "$($SYLIUS_CACHE_DIR/chromedriver --version | grep -c 2.34)" = "0" ]; then + curl http://chromedriver.storage.googleapis.com/2.34/chromedriver_linux64.zip > chromedriver.zip unzip chromedriver.zip chmod +x chromedriver mv chromedriver $SYLIUS_CACHE_DIR @@ -60,7 +52,7 @@ before_script: # Download and configure Selenium - | - if [ ! -f $SYLIUS_CACHE_DIR/selenium.jar ]; then + if [ ! -f $SYLIUS_CACHE_DIR/selenium.jar ] || [ "$(java -jar $SYLIUS_CACHE_DIR/selenium.jar --version | grep -c 3.4.0)" = "0" ]; then curl http://selenium-release.storage.googleapis.com/3.4/selenium-server-standalone-3.4.0.jar > selenium.jar mv selenium.jar $SYLIUS_CACHE_DIR fi