From 5152f6f7a0f5515d0fe1717d0c3dcb40c26ab2c9 Mon Sep 17 00:00:00 2001 From: John Lees-Miller Date: Sun, 7 Jul 2019 17:59:35 +0100 Subject: [PATCH 1/4] Put CI back to trusty Xenial is now the default. Trusty is now out of support but still not end of life. Also omit the ruby patch versions so we don't have to keep updating them. --- .travis.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 00f3b2d6..6b7d6e05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,14 @@ language: ruby +dist: trusty cache: bundler rvm: - - 2.0.0 - - 2.1.10 - - 2.2.10 - - 2.3.8 - - 2.4.5 - - 2.5.5 - - 2.6.2 + - 2.0 + - 2.1 + - 2.2 + - 2.3 + - 2.4 + - 2.5 + - 2.6 - ruby-head matrix: include: From b2573f6069ef1eecb440d23c93015dfa011d283a Mon Sep 17 00:00:00 2001 From: John Lees-Miller Date: Sun, 7 Jul 2019 18:18:49 +0100 Subject: [PATCH 2/4] Use rbx-4 in CI --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6b7d6e05..d98d0e27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,12 +18,10 @@ matrix: jdk: openjdk7 - rvm: jruby-head jdk: oraclejdk8 - - rvm: rbx-3 - env: - - RUBYOPT="-rbundler/deprecate" + - rvm: rbx-4 allow_failures: - rvm: ruby-head - - rvm: rbx-3 + - rvm: rbx-4 - rvm: jruby-head before_install: - gem --version From fc23db2efc8ba7b39e5ef94ddbd0bf23a4d5ba5e Mon Sep 17 00:00:00 2001 From: John Lees-Miller Date: Sat, 20 Jul 2019 15:06:17 +0100 Subject: [PATCH 3/4] Update changelog for #399 --- Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog.md b/Changelog.md index 57fccdf4..1240b3de 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ Tooling / Documentation - Update `example_recursive.rb` in README [#397](https://github.com/rubyzip/rubyzip/pull/397) +- Fix CI on `trusty` for now, and automatically pick the latest ruby patch version [#399](https://github.com/rubyzip/rubyzip/pull/399) # 1.2.3 From 8dfc95dc79c93c0a4c10cf9407784bc736600564 Mon Sep 17 00:00:00 2001 From: John Lees-Miller Date: Sat, 20 Jul 2019 15:15:30 +0100 Subject: [PATCH 4/4] Hold jruby at 9.1 on JDK 7 --- .travis.yml | 2 +- Changelog.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d98d0e27..358e2a8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ matrix: include: - rvm: jruby jdk: oraclejdk8 - - rvm: jruby + - rvm: jruby-9.1 jdk: openjdk7 - rvm: jruby-head jdk: oraclejdk8 diff --git a/Changelog.md b/Changelog.md index 1240b3de..8bb4f6dd 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,7 +5,7 @@ Tooling / Documentation - Update `example_recursive.rb` in README [#397](https://github.com/rubyzip/rubyzip/pull/397) -- Fix CI on `trusty` for now, and automatically pick the latest ruby patch version [#399](https://github.com/rubyzip/rubyzip/pull/399) +- Hold CI at `trusty` for now, automatically pick the latest ruby patch version, use rbx-4 and hold jruby at 9.1 [#399](https://github.com/rubyzip/rubyzip/pull/399) # 1.2.3