generator.yml in shakapacker-8.0.1

- old
+ new
@@ -1,51 +1,51 @@
 name: Generator specs
 
 on:
   push:
     branches:
-      - 'master'
+      - 'main'
   pull_request:
 
+concurrency:
+  # Pushing new changes to a branch will cancel any in-progress CI runs
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
     name: Generator specs
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest]
-        ruby: ['2.6', '2.7', '3.0']
-        use_package_json_gem: ['true', 'false']
+        ruby: ['2.7', '3.0', '3.1', '3.2', '3.3']
         gemfile:
           - gemfiles/Gemfile-rails.6.0.x
           - gemfiles/Gemfile-rails.6.1.x
           - gemfiles/Gemfile-rails.7.0.x
+          - gemfiles/Gemfile-rails.7.1.x
           # Uncomment the following line only to ensure compatibility with the
           # upcomming Rails versions, maybe before a release.
           #- gemfiles/Gemfile-rails-edge
         exclude:
-          - ruby: 2.6
-            os: ubuntu-latest
-            gemfile: gemfiles/Gemfile-rails.7.0.x
-          - ruby: 2.6
-            os: ubuntu-latest
-            gemfile: gemfiles/Gemfile-rails-edge
+          - ruby: '3.1'
+            gemfile: gemfiles/Gemfile-rails.6.0.x
+          - ruby: '3.2'
+            gemfile: gemfiles/Gemfile-rails.6.0.x
+          - ruby: '3.3'
+            gemfile: gemfiles/Gemfile-rails.6.0.x
+          - ruby: '3.3'
+            gemfile: gemfiles/Gemfile-rails.6.1.x
+
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
 
     steps:
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      # Bundler 2.5.0 dropped support for Ruby 2.6 and 2.7
-      - name: Use Bundler 2.4.22
-        run: |
-          gem install bundler -v '2.4.22'
-          bundle config --local path vendor/bundle
-      - name: Install dependencies
-        run: bundle install
+          bundler-cache: true
       - run: bundle exec rake run_spec:generator
-        env:
-          SHAKAPACKER_USE_PACKAGE_JSON_GEM: ${{ matrix.use_package_json_gem }}