From 65fcb69d3a7a4b4ea71cb1d2a3648a12e78a90a6 Mon Sep 17 00:00:00 2001 From: Benjamin Quorning Date: Fri, 27 Sep 2024 16:25:59 +0200 Subject: [PATCH 1/3] Update Gemfile to point to metagem repo Co-authored-by: Jon Rowe --- Gemfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index f9dbc01..6e9fda7 100644 --- a/Gemfile +++ b/Gemfile @@ -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 From e6af8e4075e502b8029f5786657a840b32549e12 Mon Sep 17 00:00:00 2001 From: Benjamin Quorning Date: Fri, 27 Sep 2024 16:30:37 +0200 Subject: [PATCH 2/3] Fix RuboCop offenses --- rspec-activemodel-mocks.gemspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rspec-activemodel-mocks.gemspec b/rspec-activemodel-mocks.gemspec index 5f1f9bb..2c8f1b7 100644 --- a/rspec-activemodel-mocks.gemspec +++ b/rspec-activemodel-mocks.gemspec @@ -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 From 76f384ec4f9c0378df95934dc3479090ed6cbaaf Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Tue, 1 Oct 2024 12:13:46 +0100 Subject: [PATCH 3/3] Allow legacy node --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 37489fd..fb9163c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 }}