diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2018-12-19 21:09:34 +0100 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2018-12-19 21:47:50 +0100 |
| commit | 1b7c3222e86b98ce886110ae0860ba62e35e2299 (patch) | |
| tree | 21728e09c24e5d9c79360a820b49b1b72efb3a70 /.travis.yml | |
| parent | abae9d0e0a0f1628cbf608765db09c1db3303732 (diff) | |
| download | rails-1b7c3222e86b98ce886110ae0860ba62e35e2299.tar.gz rails-1b7c3222e86b98ce886110ae0860ba62e35e2299.tar.bz2 rails-1b7c3222e86b98ce886110ae0860ba62e35e2299.zip | |
Require Ruby 2.5 for Rails 6.
Generally followed the pattern for https://github.com/rails/rails/pull/32034
* Removes needless CI configs for 2.4
* Targets 2.5 in rubocop
* Updates existing CHANGELOG entries for fewer merge conflicts
* Removes Hash#slice extension as that's inlined on Ruby 2.5.
* Removes the need for send on define_method in MethodCallAssertions.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/.travis.yml b/.travis.yml index 6acba41c0e..2e00860c95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,21 +64,11 @@ env: - "GEM=ac:integration" rvm: - - 2.4.5 - 2.5.3 - ruby-head matrix: include: - - rvm: 2.4.5 - env: "GEM=railties" - sudo: required - before_install: - - "rm ${BUNDLE_GEMFILE}.lock" - - "travis_retry gem update --system" - - "travis_retry gem install bundler" - - "sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/10/main/postgresql.conf" - - "sudo service postgresql restart 10" - rvm: 2.5.3 env: "GEM=railties" sudo: required @@ -99,19 +89,6 @@ matrix: - "sudo service postgresql restart 10" - rvm: 2.5.3 env: "GEM=av:ujs" - - rvm: 2.4.5 - sudo: required - env: "GEM=aj:integration" - services: - - memcached - - redis-server - - rabbitmq - before_install: - - sudo sed -i -e '/local.*peer/s/postgres/all/' -e 's/peer\|md5/trust/g' /etc/postgresql/*/main/pg_hba.conf - - "sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/10/main/postgresql.conf" - - "sudo service postgresql restart 10" - - "[ -f /tmp/beanstalkd-1.10/Makefile ] || (curl -L https://github.com/beanstalkd/beanstalkd/archive/v1.10.tar.gz | tar xz -C /tmp)" - - "pushd /tmp/beanstalkd-1.10 && make && (./beanstalkd &); popd" - rvm: 2.5.3 sudo: required env: "GEM=aj:integration" @@ -138,13 +115,6 @@ matrix: - "sudo service postgresql restart 10" - "[ -f /tmp/beanstalkd-1.10/Makefile ] || (curl -L https://github.com/beanstalkd/beanstalkd/archive/v1.10.tar.gz | tar xz -C /tmp)" - "pushd /tmp/beanstalkd-1.10 && make && (./beanstalkd &); popd" - - rvm: 2.4.5 - env: "GEM=ar:mysql2" - sudo: required - before_install: - - "sudo mysql -e \"use mysql; update user set authentication_string='' where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;\"" - - "sudo mysql_upgrade" - - "sudo service mysql restart" - rvm: 2.5.3 env: "GEM=ar:mysql2" sudo: required @@ -167,12 +137,6 @@ matrix: - rvm: 2.5.3 env: - "GEM=ar:sqlite3_mem" - - rvm: 2.4.5 - env: "GEM=ar:postgresql" - sudo: required - before_install: - - "sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/10/main/postgresql.conf" - - "sudo service postgresql restart 10" - rvm: 2.5.3 env: "GEM=ar:postgresql" sudo: required |