Upgrade workflow (#43)

* Test and lint against node 16 too * Upgrading Rubocop and Rspec workflows with latest version of Ruby and Rails * Using string for ruby versions * Removing TargetRubyVersion in rubocop * Updating node-version to latest LTS * Removing Ruby 3.1 in workflows * remove ruby 3.0 from ruby specs workflow * add ruby 2.6 into ruby specs workflow * specify ruby 2.6 to use Gemfile rails 5.2.x to 6.1x * add ruby 3.0 into ruby specs workflow * support ruby 2.6 in workflow * exclude ruby 3.0 from using rails 5.2 Co-authored-by: Guillaume Briday <[email protected]>
shakacode · Feb 1, 2022 · a349a9a · a349a9a
1 parent 976c2e8
commit a349a9a
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 54 deletions.
diff --git a/.github/workflows/jest.yml b/.github/workflows/jest.yml
@@ -20,11 +20,8 @@ jobs:
           node-version: ${{ matrix.node }}
           cache: yarn
 
-      - name: Install yarn maybe
-        run: which yarn || npm install -g yarn
-
       - name: Install dependencies
-        run: yarn --frozen-lockfile
+        run: yarn --frozen-lockfile --non-interactive --prefer-offline
 
       - name: Jest Specs
         run: yarn test
diff --git a/.github/workflows/js-lint.yml b/.github/workflows/js-lint.yml
@@ -3,13 +3,12 @@ name: JS lint
 on: [push, pull_request]
 
 jobs:
-  js-lint:
+  lint:
     name: JS Lint
-
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node: [14]
+        node: [12.x, 14.x, 16.x]
 
     runs-on: ${{ matrix.os }}
 
@@ -21,11 +20,8 @@ jobs:
           node-version: ${{ matrix.node }}
           cache: yarn
 
-      - name: Install yarn maybe
-        run: which yarn || npm install -g yarn
-
       - name: Install dependencies
-        run: yarn --frozen-lockfile
+        run: yarn --frozen-lockfile --non-interactive --prefer-offline
 
       - name: Lint
         run: yarn lint
diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
@@ -6,34 +6,17 @@ jobs:
   rubocop:
     name: Rubocop
     runs-on: ${{ matrix.os }}
-    env:
-      BUNDLE_JOBS: 4
-      BUNDLE_RETRY: 3
     strategy:
       matrix:
         os: [ubuntu-latest]
-        ruby: [
-          2.7
-        ]
+        ruby: ['2.7', '3.0']
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: /home/runner/bundle
-          key: bundle-use-ruby-gems-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            bundle-use-ruby-gems-
-
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
 
-      - name: Bundle install
-        run: |
-          gem install bundler -v 2.1.4
-          bundle config path /home/runner/bundle
-          bundle install
-
-      - name: Ruby linter
+      - name: Ruby rubocop
         run: bundle exec rubocop
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -6,43 +6,36 @@ jobs:
   test:
     name: Ruby specs
     runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' || matrix.experimental }}
     strategy:
-      fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        ruby:
-          - 2.7
-          - "3.0"
+        ruby: ['2.6', '2.7', '3.0']
         gemfile:
           - gemfiles/Gemfile-rails.5.2.x
           - gemfiles/Gemfile-rails.6.0.x
           - gemfiles/Gemfile-rails.6.1.x
+          - gemfiles/Gemfile-rails.7.0.x
+          - gemfiles/Gemfile-rails-edge
         exclude:
-          - ruby: 2.5
-            gemfile: gemfiles/Gemfile-rails.6.1.x
-          - ruby: "3.0"
-            gemfile: gemfiles/Gemfile-rails.5.2.x
-        experimental: [false]
-        include:
-          - ruby: 2.7
+          - ruby: 2.6
             os: ubuntu-latest
-            gemfile: gemfiles/Gemfile-rails-edge
-            experimental: true
-          - ruby: "3.0"
+            gemfile: gemfiles/Gemfile-rails.7.0.x
+          - ruby: 2.6
             os: ubuntu-latest
             gemfile: gemfiles/Gemfile-rails-edge
-            experimental: true
+          - ruby: 3.0
+            os: ubuntu-latest
+            gemfile: gemfiles/Gemfile-rails.5.2.x
 
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+
     steps:
       - uses: actions/checkout@v2
-
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true # Run "bundle install", and cache the result automatically.
+          bundler-cache: true
 
       - name: Ruby specs
-        run: bundle exec rake
+        run: bundle exec rake test
diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-16.7.0
+16
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,6 +1,5 @@
 require: rubocop-performance
 AllCops:
-  TargetRubyVersion: 2.7
   # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
   # to ignore them, so only the ones explicitly set in this file are enabled.
   DisabledByDefault: true

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shakapacker (6.0.0)
+    shakapacker (6.1.0.beta.0)
       activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)

diff --git a/gemfiles/Gemfile-rails.7.0.x b/gemfiles/Gemfile-rails.7.0.x
@@ -0,0 +1,12 @@
+source "https://rubygems.org"
+
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+gemspec path: "../"
+
+gem "rails", '~>7.0.0'
+gem "arel", github: "rails/arel"
+gem "rake", ">= 11.1"
+gem "rack-proxy", require: false
+gem "minitest", "~> 5.0"
+gem "byebug"
diff --git a/webpacker.gemspec b/webpacker.gemspec
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
     "source_code_uri" => "https://github.com/shakacode/shakapacker/tree/v#{npm_version}",
   }
 
-  s.required_ruby_version = ">= 2.7.0"
+  s.required_ruby_version = ">= 2.6.0"
 
   s.add_dependency "activesupport", ">= 5.2"
   s.add_dependency "railties",      ">= 5.2"