From 0c02ce0e152ecea9279945989f000d45ca4b5ac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Sat, 12 Jun 2021 19:54:57 +0200 Subject: [PATCH 1/3] Drop support for rake 12 too --- .github/workflows/ci.yml | 17 ----------------- Gemfile | 3 --- warbler.gemspec | 2 +- 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9e523765..8b03994a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,6 @@ jobs: matrix: java-version: [8, 15] ruby-version: [jruby-9.2.18.0, jruby-head] - rake-version: [''] task: [''] include: @@ -31,16 +30,6 @@ jobs: ruby-version: jruby-9.2.18.0 task: integration - - java-version: 8 - ruby-version: jruby-9.2.18.0 - rake-version: ~>12.3 - task: '' - - - java-version: 15 - ruby-version: jruby-9.2.18.0 - rake-version: ~>12.3 - task: '' - fail-fast: false steps: @@ -64,17 +53,11 @@ jobs: - name: Install dependencies run: bundle install --jobs=3 --retry=3 - env: - RAKE_VERSION: ${{ matrix.rake-version }} - name: Run tests run: bundle exec rake ${{ matrix.TASK }} - env: - RAKE_VERSION: ${{ matrix.rake-version }} if: matrix.ruby-version != 'jruby-head' - name: Run tests run: bundle exec rake ${{ matrix.TASK }} || exit 0 - env: - RAKE_VERSION: ${{ matrix.rake-version }} if: matrix.ruby-version == 'jruby-head' diff --git a/Gemfile b/Gemfile index ca8173ff..4a270c85 100644 --- a/Gemfile +++ b/Gemfile @@ -5,9 +5,6 @@ gemspec rubyzip_version = ENV['RUBYZIP_VERSION'] gem 'rubyzip', rubyzip_version if rubyzip_version && !rubyzip_version.empty? -rake_version = ENV['RAKE_VERSION'] -gem 'rake', rake_version, :require => nil if rake_version && !rake_version.empty? - group :development, :test do gem 'rdoc', ['>= 3.10', '< 4.3'], :require => nil end diff --git a/warbler.gemspec b/warbler.gemspec index cc2caa64..23e2e436 100644 --- a/warbler.gemspec +++ b/warbler.gemspec @@ -28,7 +28,7 @@ bundle up all of your application files for deployment to a Java environment.} gem.required_ruby_version = ">= 2.5" - gem.add_runtime_dependency 'rake', ['>= 12.3.3'] + gem.add_runtime_dependency 'rake', ['>= 13.0.3'] gem.add_runtime_dependency 'jruby-jars', ['>= 9.0.0'] gem.add_runtime_dependency 'jruby-rack', ['>= 1.1.1', '< 1.3'] gem.add_runtime_dependency 'rubyzip', '>= 1.0.0' From 4b0c689a3528801120fee88598612586e2b51d66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Sat, 12 Jun 2021 19:55:22 +0200 Subject: [PATCH 2/3] Drop now unnecessary RSpec/Rake compatibility code --- Rakefile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Rakefile b/Rakefile index 02f7ef65..869ec477 100644 --- a/Rakefile +++ b/Rakefile @@ -18,12 +18,6 @@ end require 'rake/clean' CLEAN << "pkg" << "doc" << Dir['integration/**/target'] -unless Rake::Application.method_defined? :last_comment - Rake::Application.module_eval do - alias_method :last_comment, :last_description - end -end # Rake 11 compatibility (due rspec/core/rake_task < 3.0) - require 'rspec/core/rake_task' RSpec::Core::RakeTask.new(:spec) do |t| t.rspec_opts = ['--color', "--format documentation"] From 765bbba65f27ffdb7855eeaee00693ea60593b2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Sat, 12 Jun 2021 19:58:39 +0200 Subject: [PATCH 3/3] Run integration tests against jruby-head too --- .github/workflows/ci.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b03994a..b6db5564 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,16 +19,7 @@ jobs: matrix: java-version: [8, 15] ruby-version: [jruby-9.2.18.0, jruby-head] - task: [''] - - include: - - java-version: 8 - ruby-version: jruby-9.2.18.0 - task: integration - - - java-version: 15 - ruby-version: jruby-9.2.18.0 - task: integration + task: ['', integration] fail-fast: false