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 }} diff --git a/test/support/acceptance_test.rb b/test/support/acceptance_test.rb index ea3a3dfe..af2c36a0 100644 --- a/test/support/acceptance_test.rb +++ b/test/support/acceptance_test.rb @@ -659,12 +659,14 @@ 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 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 ''" }