Skip to content

Fix the CI #62

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
merged 3 commits into from
Oct 1, 2024
Merged

Fix the CI #62

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
65fcb69
Update Gemfile to point to metagem repo
bquorning Sep 27, 2024
e6af8e4
Fix RuboCop offenses
bquorning Sep 27, 2024
76f384e
Allow legacy node
JonRowe Oct 1, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ jobs:
RAILS_VERSION: '~> 4.2.0'

env:
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
LEGACY_CI: true
JRUBY_OPTS: ${{ matrix.container.jruby_opts || '--dev' }}
RAILS_VERSION: ${{ matrix.env.RAILS_VERSION }}
Expand Down
7 changes: 6 additions & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@ gemspec
if File.exist?(library_path) && !ENV['USE_GIT_REPOS']
gem lib, :path => library_path
else
gem lib, :git => "https://github.com/rspec/#{lib}.git", :branch => ENV.fetch('RSPEC_BRANCH', 'main')
branch = ENV.fetch('RSPEC_BRANCH', 'main')
if lib == 'rspec'
gem 'rspec', :git => "https://github.com/rspec/rspec-metagem.git", :branch => branch
else
gem lib, :git => "https://github.com/rspec/#{lib}.git", :branch => branch
end
end
end

Expand Down
6 changes: 3 additions & 3 deletions rspec-activemodel-mocks.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Gem::Specification.new do |s|
s.cert_chain = [File.expand_path('~/.gem/rspec-gem-public_cert.pem')]
end

s.add_runtime_dependency('activemodel', [">= 3.0"])
s.add_runtime_dependency('activesupport', [">= 3.0"])
s.add_runtime_dependency('rspec-mocks', [">= 2.99", "< 4.0"])
s.add_dependency('activemodel', [">= 3.0"])
s.add_dependency('activesupport', [">= 3.0"])
s.add_dependency('rspec-mocks', [">= 2.99", "< 4.0"])
end
Loading