Merge remote-tracking branch 'upstream/pull/2970' into master

[rails.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index b950b1e18e2cbf8083078758a08702d7493c267a..77b17cf9dc39a454ead3b479c789593a82216412 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,14 @@
 dist: bionic
 language: ruby
 rvm:
 dist: bionic
 language: ruby
 rvm:

-  - 2.5.3
+  - 2.7.0

 cache:
   - bundler
 addons:
   postgresql: 9.5
   apt:
     packages:
 cache:
   - bundler
 addons:
   postgresql: 9.5
   apt:
     packages:

+      - firefox-geckodriver

       - libarchive-dev
       - libgd-dev
       - libffi-dev
       - libarchive-dev
       - libgd-dev
       - libffi-dev


@@ -21,7 +22,8 @@ before_script:
   - psql -U postgres -f db/functions/functions.sql openstreetmap
   - cp config/travis.database.yml config/database.yml
   - cp config/example.storage.yml config/storage.yml
   - psql -U postgres -f db/functions/functions.sql openstreetmap
   - cp config/travis.database.yml config/database.yml
   - cp config/example.storage.yml config/storage.yml

-  - echo -e "---\nmemcache_servers:\n  - 127.0.0.1" > config/settings.local.yml
+  - touch config/settings.local.yml
+  - echo -e "---\nmemcache_servers:\n  - 127.0.0.1" > config/settings/test.local.yml

   - bundle exec rake db:migrate
   - bundle exec rake i18n:js:export
   - bundle exec rake yarn:install
   - bundle exec rake db:migrate
   - bundle exec rake i18n:js:export
   - bundle exec rake yarn:install


@@ -29,6 +31,7 @@ script:
   - bundle exec rubocop -f fuubar
   - bundle exec rake eslint
   - bundle exec erblint .
   - bundle exec rubocop -f fuubar
   - bundle exec rake eslint
   - bundle exec erblint .

+  - bundle exec brakeman -q

   - bundle exec rake db:structure:dump
   - sed -e "/idle_in_transaction_session_timeout/d" -e 's/ IMMUTABLE / /' -e "/^--/d" db/structure.sql > db/structure.actual
   - diff -uw db/structure.expected db/structure.actual
   - bundle exec rake db:structure:dump
   - sed -e "/idle_in_transaction_session_timeout/d" -e 's/ IMMUTABLE / /' -e "/^--/d" db/structure.sql > db/structure.actual
   - diff -uw db/structure.expected db/structure.actual