Merge branch 'disable-bundler-cache' into blacklight-latest

projectblacklight · Jun 22, 2024 · 4d234d9 · 4d234d9
2 parents f9eb13f + 3479b1d
commit 4d234d9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 28 deletions.
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -11,26 +11,22 @@ jobs:
     name: test (ruby ${{ matrix.ruby }} / rails ${{ matrix.rails_version }} / blacklight ${{ matrix.blacklight_version }} ${{ matrix.additional_name }})
     strategy:
       matrix:
-        rails_version: ['7.0.8']
+        rails_version: ['7.0.8.4']
         ruby: ['3.1', '3.2']
         bootstrap_version: ['~> 4.0']
         blacklight_version: ['latest']
         additional_engine_cart_rails_options: ['']
         additional_name: ['']
         include:
-          - rails_version: '6.1.7.6'
+          - rails_version: '6.1.7.8'
             ruby: '3.0'
             blacklight_version: '7.33.1'
             bootstrap_version: ~> 4.0
-          - rails_version: '6.1.7.6'
-            ruby: '2.7'
-            blacklight_version: '7.33.1'
-            bootstrap_version: ~> 4.0
-          - rails_version: '7.0.8'
+          - rails_version: '7.0.8.4'
             ruby: '3.1'
             blacklight_version: '8.0.0'
             bootstrap_version: ~> 4.0
-          - rails_version: '7.0.8'
+          - rails_version: '7.0.8.4'
             ruby: '3.2'
             blacklight_version: '8.0.0'
             bootstrap_version: ~> 4.0
@@ -42,15 +38,17 @@ jobs:
       BOOTSTRAP_VERSION: ${{ matrix.bootstrap_version }}
       ENGINE_CART_RAILS_OPTIONS: --skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Ruby ${{ matrix.ruby }}
-      uses: ruby/setup-ruby@v1
-      with:
-        bundler-cache: true
-        bundler: '2.4.22'
-        ruby-version: ${{ matrix.ruby }}
-    - name: Run tests
-      run: bundle exec rake
+      - uses: actions/checkout@v3
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: false
+          bundler: "latest"
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake
 
   build:
     runs-on: ubuntu-latest

diff --git a/Gemfile b/Gemfile
@@ -27,16 +27,6 @@ else
     else
       gem 'rails', ENV['RAILS_VERSION']
     end
-
-    case ENV['RAILS_VERSION']
-    when /^6.0/
-      gem 'sass-rails', '>= 6'
-      gem 'webpacker', '~> 4.0'
-    when /^5.[12]/
-      gem 'sass-rails', '~> 5.0'
-      gem 'sprockets', '~> 3.7'
-      gem 'thor', '~> 0.20'
-    end
   end
 end
 # END ENGINE_CART BLOCK

diff --git a/spec/test_app_templates/lib/generators/test_app_generator.rb b/spec/test_app_templates/lib/generators/test_app_generator.rb
@@ -13,7 +13,7 @@ def add_gems
     gem 'blacklight', '~> 7.17' unless Bundler.locked_gems.dependencies.key? 'blacklight'
     gem 'blacklight-gallery', '~> 4.0' unless Bundler.locked_gems.dependencies.key? 'blacklight-gallery'
 
-    Bundler.with_clean_env do
+    Bundler.with_unbundled_env do
       run 'bundle install'
     end
   end