Skip to content

Commit

Permalink
Merge branch 'master' into feature/fuubar
Browse files Browse the repository at this point in the history
  • Loading branch information
briandunn authored Jan 3, 2025
2 parents 50f666b + 1931edc commit 358834f
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
strategy:
matrix:
rspec-minor-versions: [6, 7, 8, 9, 10, 11, 12, 13]
ruby-versions: ["3.1", "3.2", "3.3"]
ruby-versions: ["3.1", "3.2", "3.3", "3.4"]
env:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rspec_3.${{ matrix.rspec-minor-versions }}.gemfile

Expand Down
6 changes: 5 additions & 1 deletion features/rspec.feature
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ Feature: rspec task
"""
And the output contains the following:
"""
# ./spec/spec_spec.rb:2:in `block (2 levels) in <top (required)>'
# ./spec/spec_spec.rb:2:in
"""
And the output contains the following:
"""
block (2 levels) in <top (required)>'
"""

Scenario: it behaves like
Expand Down
2 changes: 1 addition & 1 deletion flatware-cucumber.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Gem::Specification.new do |s|
)
s.homepage = 'http://github.com/briandunn/flatware'
s.licenses = ['MIT']
s.required_ruby_version = ['>= 2.6', '< 3.4']
s.required_ruby_version = ['>= 2.6', '< 3.5']
s.require_paths = ['lib']
s.add_dependency %(cucumber), '~> 3.0'
s.add_dependency %(flatware), Flatware::VERSION
Expand Down
2 changes: 1 addition & 1 deletion flatware-rspec.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Gem::Specification.new do |s|
)
s.homepage = 'http://github.com/briandunn/flatware'
s.licenses = ['MIT']
s.required_ruby_version = ['>= 2.6', '< 3.4']
s.required_ruby_version = ['>= 2.6', '< 3.5']
s.require_paths = ['lib']
s.add_dependency %(flatware), Flatware::VERSION
s.add_dependency %(fuubar), '>= 2.5'
Expand Down
2 changes: 1 addition & 1 deletion flatware.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Gem::Specification.new do |s|
s.homepage = 'http://github.com/briandunn/flatware'

s.licenses = ['MIT']
s.required_ruby_version = ['>= 2.6', '< 3.4']
s.required_ruby_version = ['>= 2.6', '< 3.5']
s.require_paths = ['lib']
s.executables = ['flatware']
s.add_dependency %(drb)
Expand Down

0 comments on commit 358834f

Please sign in to comment.