From b485aab7e71c1625cfc27e0f92c9509f42378458 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sun, 5 May 2024 13:19:16 +0200
Subject: Adding upstream version 1.45.3+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .github/workflows/review.yml | 66 ++++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

(limited to '.github/workflows/review.yml')

diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml
index 8cb61f2cf..c7b038135 100644
--- a/.github/workflows/review.yml
+++ b/.github/workflows/review.yml
@@ -16,8 +16,8 @@ jobs:
     outputs:
       actionlint: ${{ steps.actionlint.outputs.run }}
       clangformat: ${{ steps.clangformat.outputs.run }}
-      eslint: ${{ steps.eslint.outputs.run }}
       flake8: ${{ steps.flake8.outputs.run }}
+      golangci-lint: ${{ steps.golangci-lint.outputs.run }}
       hadolint: ${{ steps.hadolint.outputs.run }}
       shellcheck: ${{ steps.shellcheck.outputs.run }}
       yamllint: ${{ steps.yamllint.outputs.run }}
@@ -49,17 +49,6 @@ jobs:
       #     else
       #       echo "run=false" >> "${GITHUB_OUTPUT}"
       #     fi
-      - name: Check files for eslint
-        id: eslint
-        run: |
-          if [ "${{ contains(github.event.pull_request.labels.*.name, 'run-ci/eslint') }}" = "true" ]; then
-            echo "run=true" >> "${GITHUB_OUTPUT}"
-          elif git diff --name-only origin/${{ github.base_ref }} HEAD | grep -v "web/gui/v1" | grep -v "web/gui/v2" | grep -v "integrations/" | grep -Eq '.*\.js' ; then
-            echo "run=true" >> "${GITHUB_OUTPUT}"
-            echo 'JS files have changed, need to run ESLint.'
-          else
-            echo "run=false" >> "${GITHUB_OUTPUT}"
-          fi
       - name: Check files for flake8
         id: flake8
         run: |
@@ -71,6 +60,17 @@ jobs:
           else
             echo "run=false" >> "${GITHUB_OUTPUT}"
           fi
+      - name: Check files for golangci-lint
+        id: golangci-lint
+        run: |
+          if [ "${{ contains(github.event.pull_request.labels.*.name, 'run-ci/golangci-lint') }}" = "true" ]; then
+            echo "run=true" >> "${GITHUB_OUTPUT}"
+          elif git diff --name-only origin/${{ github.base_ref }} HEAD -- | grep -Eq '.*\.go' ; then
+            echo "run=true" >> $GITHUB_OUTPUT
+            echo 'Go code has changed, need to run golangci-lint.'
+          else
+            echo "run=false" >> $GITHUB_OUTPUT
+          fi
       - name: Check files for hadolint
         id: hadolint
         run: |
@@ -155,26 +155,6 @@ jobs:
             exit 1
           fi
 
-  eslint:
-    name: eslint
-    needs: prep-review
-    if: needs.prep-review.outputs.eslint == 'true'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Git clone repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          fetch-depth: 0
-      - name: Install eslint
-        run: npm install eslint -D
-      - name: Run eslint
-        uses: reviewdog/action-eslint@v1
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          reporter: github-pr-check
-          eslint_flags: '.'
-
   flake8:
     name: flake8
     needs: prep-review
@@ -187,7 +167,7 @@ jobs:
           submodules: recursive
           fetch-depth: 0
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
       - name: Run flake8
@@ -196,6 +176,26 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           reporter: github-pr-check
 
+  golangci-lint:
+    name: golangci-lint
+    needs: prep-review
+    if: needs.prep-review.outputs.golangci-lint == 'true'
+    strategy:
+      matrix:
+        tree:
+          - src/go/collectors/go.d.plugin
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Run golangci-lint
+        uses: reviewdog/action-golangci-lint@v2
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          reporter: github-pr-check
+          golangci_lint_flags: '--timeout=10m'
+          workdir: ${{ matrix.tree }}
+
   hadolint:
     name: hadolint
     needs: prep-review
-- 
cgit v1.2.3