Skip to content

Drop rake 12 support too #505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
olleolleolle merged 3 commits into from
Jun 13, 2021
Merged

Drop rake 12 support too #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c02ce0
Drop support for rake 12 too
deivid-rodriguez Jun 12, 2021
4b0c689
Drop now unnecessary RSpec/Rake compatibility code
deivid-rodriguez Jun 12, 2021
765bbba
Run integration tests against jruby-head too
deivid-rodriguez Jun 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 1 addition & 27 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,7 @@ jobs:
matrix:
java-version: [8, 15]
ruby-version: [jruby-9.2.18.0, jruby-head]
rake-version: ['']
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

- 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: ''
task: ['', integration]

fail-fast: false

Expand All @@ -64,17 +44,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'
3 changes: 0 additions & 3 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 0 additions & 6 deletions Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion warbler.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down