Skip to content

Commit

Permalink
Merge branch 'main' of github.com:jaynetics/character_set
Browse files Browse the repository at this point in the history
* 'main' of github.com:jaynetics/character_set:
  Update build

# Conflicts:
#	Gemfile
  • Loading branch information
jaynetics committed Jan 7, 2024
2 parents 744ee05 + e697d79 commit 6203253
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gouteur.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: 3.3
- name: Prepare
run: |
bundle install --jobs 4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: 3.3
- name: Cache gems
uses: actions/cache@v1
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
ruby: [ '2.3', '2.7', '3.0', '3.1', 'ruby-head', 'jruby-head' ]
ruby: [ '2.4', '2.7', '3.0', '3.1', '3.2', '3.3', 'ruby-head', 'jruby-head' ]

steps:
- uses: actions/checkout@v2
Expand All @@ -25,4 +25,4 @@ jobs:
- name: Test with Rake
run: bundle exec rake
- uses: codecov/codecov-action@v3
if: matrix.ruby == '2.7'
if: matrix.ruby == '3.2'
7 changes: 4 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@ gemspec

gem 'benchmark-ips', '~> 2.7'
gem 'get_process_mem', '~> 0.2.3'
gem 'rake', '~> 13.0'
gem 'rake', '~> 13.1'
gem 'rake-compiler', '~> 1.1'
gem 'range_compressor', '~> 1.0'
gem 'regexp_parser', '~> 2.9'
gem 'regexp_property_values', '~> 1.5'
gem 'rspec', '~> 3.8'
if RUBY_VERSION.to_f >= 2.7
gem 'warning', '~> 1.3'
if RUBY_VERSION.to_f >= 3.0
gem 'gouteur', '~> 1.0.0'
gem 'rubocop', '~> 1.59'
gem 'simplecov-cobertura'
gem 'simplecov-cobertura', require: false
end
4 changes: 3 additions & 1 deletion spec/character_set/ractor_compatibility_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
describe CharacterSet, if: defined?(Ractor) do
# skip ractor test when evaluating coverage
# https://github.com/simplecov-ruby/simplecov/issues/1058
describe CharacterSet, if: defined?(Ractor) && !defined?(SimpleCov) do
it 'can be used with Ractor' do
shared_instance = CharacterSet[97, 98, 99].freeze
CharacterSet.const_set('RactorTestFrozen', shared_instance)
Expand Down
8 changes: 4 additions & 4 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
if ENV['CI'] && RUBY_VERSION.start_with?('2.7')
require 'bundler/setup'
Dir[File.join(__dir__, 'support', '*.rb')].sort.each { |file| require file }

if ENV['CI'] && RUBY_VERSION.start_with?('3.2')
require 'simplecov'
require 'simplecov-cobertura'
SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
SimpleCov.start
end

require 'bundler/setup'
require 'character_set'
require 'character_set/pure'

Dir[File.join(__dir__, 'support', '*.rb')].sort.each { |file| require file }

RSpec.configure do |config|
# Enable flags like --only-failures and --next-failure
config.example_status_persistence_file_path = ".rspec_status"
Expand Down
4 changes: 0 additions & 4 deletions spec/support/flush_default_ractor_warning.rb

This file was deleted.

2 changes: 2 additions & 0 deletions spec/support/silence_default_ractor_warning.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
require 'warning'
Warning.ignore(/Ractor is experimental/)

0 comments on commit 6203253

Please sign in to comment.