Skip to content

Commit cf13ee4

Browse files
authored
Merge pull request #62 from bquorning/fix-the-ci
Fix the CI
2 parents 1b86407 + 76f384e commit cf13ee4

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ jobs:
226226
RAILS_VERSION: '~> 4.2.0'
227227

228228
env:
229+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
229230
LEGACY_CI: true
230231
JRUBY_OPTS: ${{ matrix.container.jruby_opts || '--dev' }}
231232
RAILS_VERSION: ${{ matrix.env.RAILS_VERSION }}

Gemfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@ gemspec
88
if File.exist?(library_path) && !ENV['USE_GIT_REPOS']
99
gem lib, :path => library_path
1010
else
11-
gem lib, :git => "https://github.com/rspec/#{lib}.git", :branch => ENV.fetch('RSPEC_BRANCH', 'main')
11+
branch = ENV.fetch('RSPEC_BRANCH', 'main')
12+
if lib == 'rspec'
13+
gem 'rspec', :git => "https://github.com/rspec/rspec-metagem.git", :branch => branch
14+
else
15+
gem lib, :git => "https://github.com/rspec/#{lib}.git", :branch => branch
16+
end
1217
end
1318
end
1419

rspec-activemodel-mocks.gemspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
3333
s.cert_chain = [File.expand_path('~/.gem/rspec-gem-public_cert.pem')]
3434
end
3535

36-
s.add_runtime_dependency('activemodel', [">= 3.0"])
37-
s.add_runtime_dependency('activesupport', [">= 3.0"])
38-
s.add_runtime_dependency('rspec-mocks', [">= 2.99", "< 4.0"])
36+
s.add_dependency('activemodel', [">= 3.0"])
37+
s.add_dependency('activesupport', [">= 3.0"])
38+
s.add_dependency('rspec-mocks', [">= 2.99", "< 4.0"])
3939
end

0 commit comments

Comments
 (0)