More compact config

rubocop · Nov 25, 2020 · 8699348 · 8699348
1 parent 55fc845
commit 8699348
Showing 1 changed file with 23 additions and 31 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,45 +14,37 @@ jobs:
       - run: bundle install
       - run: bundle exec rake confirm_config documentation_syntax_check confirm_documentation
 
-  rspec:
+  main:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.4', '2.5', '2.6', '2.7', 'jruby']
-    name: RSpec, Ruby ${{ matrix.ruby }}
+        ruby:
+          - 2.4
+          - 2.5
+          - 2.6
+          - 2.7
+          - jruby
+        task:
+          - internal_investigation
+          - spec
+        rubocop_version:
+          - gem
+        include:
+          - rubocop_version: edge
+            ruby: 2.7
+            task: internal_investigation
+          - rubocop_version: edge
+            ruby: 2.7
+            task: spec
+    name: ${{ matrix.task }}, Ruby ${{ matrix.ruby }} (${{ matrix.rubocop_version }})
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: "${{ matrix.ruby }}"
-      - run: bundle install
-      - run: bundle exec rake spec
-
-  rubocop:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: ['2.4', '2.5', '2.6', '2.7', 'jruby']
-    name: RuboCop, Ruby ${{ matrix.ruby }}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: "${{ matrix.ruby }}"
-      - run: bundle install
-      - run: bundle exec rake internal_investigation
-
-  edge-rubocop:
-    runs-on: ubuntu-latest
-    name: RSpec and RuboCop with RuboCop master branch
-    steps:
-      - uses: actions/checkout@v2
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.7
       - name: Use latest RuboCop from `master`
         run: |
           echo "gem 'rubocop', github: 'rubocop-hq/rubocop'" > Gemfile.local
-      - run: bundle install --no-cache
-      - run: bundle exec rake spec
-      - run: bundle exec rake internal_investigation
+        if: ${{ matrix.rubocop_version == 'edge' }}
+      - run: bundle install
+      - run: bundle exec rake ${{ matrix.task }}