Adding upstream version 1.46.3.upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 65 insertions, 65 deletions

diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml
index 8cb61f2cf..30b09ec06 100644
--- a/.github/workflows/review.yml
+++ b/.github/workflows/review.yml
@@ -15,9 +15,9 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       actionlint: ${{ steps.actionlint.outputs.run }}
-      clangformat: ${{ steps.clangformat.outputs.run }}
-      eslint: ${{ steps.eslint.outputs.run }}
+      # clangformat: ${{ steps.clangformat.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,25 +49,25 @@ jobs:
       #     else
       #       echo "run=false" >> "${GITHUB_OUTPUT}"
       #     fi
-      - name: Check files for eslint
-        id: eslint
+      - name: Check files for flake8
+        id: flake8
         run: |
-          if [ "${{ contains(github.event.pull_request.labels.*.name, 'run-ci/eslint') }}" = "true" ]; then
+          if [ "${{ contains(github.event.pull_request.labels.*.name, 'run-ci/flake8') }}" = "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
+          elif git diff --name-only origin/${{ github.base_ref }} HEAD | grep -Eq '.*\.py' ; then
             echo "run=true" >> "${GITHUB_OUTPUT}"
-            echo 'JS files have changed, need to run ESLint.'
+            echo 'Python files have changed, need to run flake8.'
           else
             echo "run=false" >> "${GITHUB_OUTPUT}"
           fi
-      - name: Check files for flake8
-        id: flake8
+      - name: Check files for golangci-lint
+        id: golangci-lint
         run: |
-          if [ "${{ contains(github.event.pull_request.labels.*.name, 'run-ci/flake8') }}" = "true" ]; then
+          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 '.*\.py' ; then
+          elif git diff --name-only origin/"${{ github.base_ref }}" HEAD -- | grep -Eq '.*\.go'; then
             echo "run=true" >> "${GITHUB_OUTPUT}"
-            echo 'Python files have changed, need to run flake8.'
+            echo 'Go code has changed, need to run golangci-lint.'
           else
             echo "run=false" >> "${GITHUB_OUTPUT}"
           fi
@@ -122,58 +122,38 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           reporter: github-pr-check
 
-  clang-format:
-    name: clang-format
-    needs: prep-review
-    if: needs.prep-review.outputs.clangformat == 'true'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Git clone repository
-        uses: actions/checkout@v4
-        with:
-          submodules: false
-          fetch-depth: 0
-      - name: Check for label
-        id: label
-        run: |
-          if [ "${{ contains(github.event.pull_request.labels.*.name, 'run-ci/clang-format') }}" = "true" ]; then
-            echo 'check-all=true' >> "${GITHUB_OUTPUT}"
-          else
-            echo 'check-all=false' >> "${GITHUB_OUTPUT}"
-          fi
-      - name: Run clang-format
-        run: |
-          if [ "${{ steps.label.outputs.check-all }}" == 'true' ]; then
-            find . -regex '.*\.\(c\|cpp\|cxx\|h\|hpp\|hxx\)$' -exec clang-format -i --style=file '{}' \;
-          else
-            git diff --name-only origin/${{ github.base_ref }} HEAD | grep -E '\.cpp$|\.cxx$|\.c$|\.hpp$|\.hxx$|\.h$' | \
-            xargs -n 1 -r clang-format -i --style=file
-          fi
-          git status --porcelain=v1 > /tmp/porcelain
-          if [ -s /tmp/porcelain ]; then
-            cat /tmp/porcelain
-            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: '.'
+#  clang-format:
+#    name: clang-format
+#    needs: prep-review
+#    if: needs.prep-review.outputs.clangformat == 'true'
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Git clone repository
+#        uses: actions/checkout@v4
+#        with:
+#          submodules: false
+#          fetch-depth: 0
+#      - name: Check for label
+#        id: label
+#        run: |
+#          if [ "${{ contains(github.event.pull_request.labels.*.name, 'run-ci/clang-format') }}" = "true" ]; then
+#            echo 'check-all=true' >> "${GITHUB_OUTPUT}"
+#          else
+#            echo 'check-all=false' >> "${GITHUB_OUTPUT}"
+#          fi
+#      - name: Run clang-format
+#        run: |
+#          if [ "${{ steps.label.outputs.check-all }}" == 'true' ]; then
+#            find . -regex '.*\.\(c\|cpp\|cxx\|h\|hpp\|hxx\)$' -exec clang-format -i --style=file '{}' \;
+#          else
+#            git diff --name-only origin/${{ github.base_ref }} HEAD | grep -E '\.cpp$|\.cxx$|\.c$|\.hpp$|\.hxx$|\.h$' | \
+#            xargs -n 1 -r clang-format -i --style=file
+#          fi
+#          git status --porcelain=v1 > /tmp/porcelain
+#          if [ -s /tmp/porcelain ]; then
+#            cat /tmp/porcelain
+#            exit 1
+#          fi
 
   flake8:
     name: flake8
@@ -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