Skip to content

Commit

Permalink
Merge pull request #631 from ruby/use-test-unit-ruby-core
Browse files Browse the repository at this point in the history
Use test-unit-ruby-core
  • Loading branch information
hsbt authored Jun 8, 2023
2 parents 2cad18c + 6ec316b commit 1dabdc3
Show file tree
Hide file tree
Showing 9 changed files with 6 additions and 1,210 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/libyaml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
uses: ruby/actions/.github/workflows/ruby_versions.yml@master
with:
engine: cruby
min_version: 2.4
min_version: 2.5

build:
needs: ruby-versions
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
uses: ruby/actions/.github/workflows/ruby_versions.yml@master
with:
engine: cruby-jruby
min_version: 2.4
min_version: 2.5

test:
needs: ruby-versions
Expand Down
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ gemspec

group :development do
gem 'rake-compiler', ">= 0.4.1"
gem 'test-unit'
gem 'ruby-maven', :platforms => :jruby
gem 'test-unit'
gem 'test-unit-ruby-core'
end
7 changes: 0 additions & 7 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,4 @@ else
Rake::ExtensionTask.new("psych")
end

task :sync_tool do
require 'fileutils'
FileUtils.cp "../ruby/tool/lib/core_assertions.rb", "./test/lib"
FileUtils.cp "../ruby/tool/lib/envutil.rb", "./test/lib"
FileUtils.cp "../ruby/tool/lib/find_executable.rb", "./test/lib"
end

task :default => [:compile, :test]
2 changes: 1 addition & 1 deletion psych.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ DESCRIPTION
s.rdoc_options = ["--main", "README.md"]
s.extra_rdoc_files = ["README.md"]

s.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
s.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
s.required_rubygems_version = Gem::Requirement.new(">= 0")

if RUBY_ENGINE == 'jruby'
Expand Down
Loading

0 comments on commit 1dabdc3

Please sign in to comment.