diff --git a/.travis.yml b/.travis.yml index 2be787d2a8..7004c8f107 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ cache: git: depth: false - + env: global: - CI=true @@ -32,20 +32,24 @@ before_install: - sudo unzip chromedriver_linux64.zip -d /usr/local/bin/ - sudo chmod +x /usr/local/bin/chromedriver - google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost & + - yes | gem update --system --force + - gem install bundler install: - rm -rf test/reports - cp config/database.yml.example config/database.yml - cp db/schema.rb.example db/schema.rb - bundle config set path 'vendor/.bundle/' + - rm -rf vendor/.bundle/ - bundle install + - gem list - if [ $RAILS_ENV != 'production' ]; then yarn check || yarn install; fi - mysql -e "CREATE DATABASE plots;"; - bundle exec rake db:schema:load - bundle exec rake db:migrate - - if [ "$TRAVIS_PULL_REQUEST" == "true" ]; then + - if [ "$TRAVIS_PULL_REQUEST" == "true" ]; then gem install danger danger-junit google-cloud-storage; fi - echo "$GOOGLE_APPLICATION_CREDENTIALS_JSON" > /tmp/credentials.json # needs to be a path to a json file, so we shuffle... @@ -60,7 +64,7 @@ jobs: script: bundle exec rails test test/integration - name: "System Tests" script: bundle exec rails test:system - + after_script: - echo -e '' > output.xml; - tail -n +2 -q ./test/reports/TEST*.xml >> output.xml diff --git a/Gemfile.lock b/Gemfile.lock index eeb4787a45..979f459f43 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -693,4 +693,4 @@ RUBY VERSION ruby 2.4.4p296 BUNDLED WITH - 1.17.3 + 2.1.4