Refactor linting steps, use reviewdog action

puzzle · Jan 24, 2024 · d237ff1 · d237ff1
1 parent a682d78
commit d237ff1
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 42 deletions.
diff --git a/.github/workflows/reusable-lint.yaml b/.github/workflows/reusable-lint.yaml
@@ -8,44 +8,31 @@ jobs:
     runs-on: 'ubuntu-latest'
 
     steps:
-    - uses: actions/checkout@v3
-    - uses: ruby/setup-ruby@v1
-      with:
-        bundler-cache: true
-
-    - name: 'Set up Reviewdog'
-      env:
-        REVIEWDOG_INSTALLER: 'https://raw.githubusercontent.com/reviewdog/reviewdog/master/install.sh'
-      run: |
-        mkdir -p $HOME/bin
-        curl -sfL ${REVIEWDOG_INSTALLER} | sh -s -- -b $HOME/bin
-
-    - name: 'Set up Rubocop'
-      run: 'gem install rubocop rubocop-minitest rubocop-performance rubocop-rails'
-
-    - name: 'Run Rubocop'
-      env:
-        REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        rubocop |
-        $HOME/bin/reviewdog \
-        -f=rubocop \
-        -name="Rubocop" \
-        -reporter=github-pr-review \
-        -level=error \
-        -diff="git diff $DIFF_BRANCH"
-
-    - name: 'Set up Haml-lint'
-      run: 'gem install haml-lint'
-
-    - name: 'Run Haml-lint'
-      env:
-        REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        haml-lint |
-        $HOME/bin/reviewdog \
-        -efm="%f:%l %m" \
-        -name="Haml-lint" \
-        -reporter=github-pr-review \
-        -level=error \
-        -diff="git diff $DIFF_BRANCH"
+      - uses: actions/checkout@v4
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+
+      - uses: reviewdog/action-rubocop@v2
+        with:
+          rubocop_version: gemfile
+          rubocop_extensions: rubocop-minitest:gemfile rubocop-performance:gemfile rubocop-rails:gemfile
+          reporter: github-pr-review
+          level: error
+
+      - run: 'gem install haml-lint'
+
+      - uses: reviewdog/action-setup@v1
+
+      - name: 'Run Reviewdog HAML-Lint'
+        env:
+          REVIEWDOG_GITHUB_API_TOKEN: ${{ github.token }}
+        run: |
+          haml-lint |
+          reviewdog \
+          -efm="%f:%l %m" \
+          -name="HAML-Lint" \
+          -reporter=github-pr-review \
+          -level=error \
+          -diff="git diff $DIFF_BRANCH"
diff --git a/.github/workflows/reusable-test.yaml b/.github/workflows/reusable-test.yaml
@@ -25,7 +25,7 @@ jobs:
         ports: [ '11211:11211' ]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         bundler-cache: true