From 26ca9ba5e215247016bb6185640285ef4e86db4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 21 Sep 2022 17:16:29 +0000 Subject: [PATCH 1/3] Skip test with Rails 7 and Ruby < 3.1 --- test/support/acceptance_test.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/support/acceptance_test.rb b/test/support/acceptance_test.rb index ea3a3dfe..208e72d1 100644 --- a/test/support/acceptance_test.rb +++ b/test/support/acceptance_test.rb @@ -659,6 +659,8 @@ def exec_name end test "custom bundle path" do + skip if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.1.0") && ENV["RAILS_VERSION"] == "7.0" + bundle_path = app.path(".bundle/#{Bundler.ruby_scope}") bundle_path.dirname.mkpath From 420ede180bdee204dcc239caa7252bca0a08a5ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 21 Sep 2022 17:18:57 +0000 Subject: [PATCH 2/3] Test with Ruby 3.1 --- .github/workflows/ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8841dd9b..f56044b6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,8 +6,13 @@ jobs: strategy: fail-fast: false matrix: - ruby: [ '2.7', '3.0.2', 'head' ] + ruby: [ '2.7', '3.0.2', '3.1', 'head' ] rails: [ '6.0', '6.1', '7.0', 'edge' ] + exclude: + - ruby: '3.1' + rails: '6.0' + - ruby: '3.1' + rails: '6.1' env: RAILS_VERSION: ${{ matrix.rails }} From 6c6ca77217cdbe27fa2dc1e3705ed3473d6695d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 21 Sep 2022 17:41:27 +0000 Subject: [PATCH 3/3] Don't clean the bundle path to not remove bundled gems --- test/support/acceptance_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/support/acceptance_test.rb b/test/support/acceptance_test.rb index 208e72d1..af2c36a0 100644 --- a/test/support/acceptance_test.rb +++ b/test/support/acceptance_test.rb @@ -666,7 +666,7 @@ def exec_name FileUtils.cp_r "#{app.gem_home}/", bundle_path.to_s - app.run! "bundle install --path .bundle --clean --prefer-local" + app.run! "bundle install --path .bundle --local" assert_speedup do 2.times { assert_success "bundle exec rails runner ''" }