chore: update CI configuration

* Add Ruby 3.1 and 3.2 * Merge into one workflow * Run on PRs too
jgraichen · Aug 10, 2023 · 9aefabf · 9aefabf
1 parent fae3f5f
commit 9aefabf
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,19 +1,23 @@
 ---
 name: test
-on: push
+
+on:
+  - push
+  - pull_request
+
 jobs:
   rspec:
-    name: "${{ matrix.ruby }} / ${{ matrix.adapter }}"
+    name: "ruby-${{ matrix.ruby }}"
     runs-on: ubuntu-20.04
 
     strategy:
       fail-fast: false
       matrix:
         ruby:
+          - "3.2"
+          - "3.1"
           - "3.0"
           - "2.7"
-          - "2.6"
-          - "2.5"
 
     steps:
       - uses: actions/checkout@master
@@ -26,3 +30,20 @@ jobs:
           BUNDLE_RETRY: 3
 
       - run: bundle exec rspec --color
+
+  rubocop:
+    name: rubocop
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@master
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+          bundler-cache: true
+        env:
+          BUNDLE_JOBS: 4
+          BUNDLE_RETRY: 3
+
+      - name: Run rubocop
+        run: bundle exec rubocop --parallel --color