From d079b656b4719739b2247dcd9d46e9bec793095a Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 6 Feb 2023 17:11:34 +0100
Subject: Merging upstream version 1.38.0.

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

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

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 021376a2d..b2af615e4 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -32,39 +32,39 @@ jobs:
         run: |
           if [ "${{ github.event_name }}" = "pull_request" ]; then
             if [ "${{ contains(github.event.pull_request.labels.*.name, 'run-ci/codeql') }}" = "true" ]; then
-              echo '::set-output name=run::true'
+              echo "run=true" >> "${GITHUB_OUTPUT}"
               echo '::notice::Found ci/codeql label, unconditionally running all CodeQL checks.'
             else
-              echo '::set-output name=run::false'
+              echo "run=false" >> "${GITHUB_OUTPUT}"
             fi
           else
-            echo '::set-output name=run::true'
+            echo "run=true" >> "${GITHUB_OUTPUT}"
           fi
       - name: Check for C/C++ changes
         id: cpp
         run: |
           if [ "${{ steps.always.outputs.run }}" = "false" ]; then
             if git diff --name-only origin/${{ github.base_ref }} HEAD | grep -Eq '.*\.[ch](xx|\+\+)?' ; then
-              echo '::set-output name=run::true'
+              echo "run=true" >> "${GITHUB_OUTPUT}"
               echo '::notice::C/C++ code has changed, need to run CodeQL.'
             else
-              echo '::set-output name=run::false'
+              echo "run=false" >> "${GITHUB_OUTPUT}"
             fi
           else
-            echo '::set-output name=run::true'
+            echo "run=true" >> "${GITHUB_OUTPUT}"
           fi
       - name: Check for python changes
         id: python
         run: |
           if [ "${{ steps.always.outputs.run }}" = "false" ]; then
             if git diff --name-only origin/${{ github.base_ref }} HEAD | grep -Eq 'collectors/python.d.plugin/.*\.py' ; then
-              echo '::set-output name=run::true'
+              echo "run=true" >> "${GITHUB_OUTPUT}"
               echo '::notice::Python code has changed, need to run CodeQL.'
             else
-              echo '::set-output name=run::false'
+              echo "run=false" >> "${GITHUB_OUTPUT}"
             fi
           else
-            echo '::set-output name=run::true'
+            echo "run=true" >> "${GITHUB_OUTPUT}"
           fi
 
   analyze-cpp:
@@ -87,7 +87,7 @@ jobs:
       - name: Prepare environment
         run: ./packaging/installer/install-required-packages.sh --dont-wait --non-interactive netdata
       - name: Build netdata
-        run: ./netdata-installer.sh --dont-start-it --disable-telemetry --dont-wait --install /tmp/install --one-time-build
+        run: ./netdata-installer.sh --dont-start-it --disable-telemetry --dont-wait --install-prefix /tmp/install --one-time-build
       - name: Run CodeQL
         uses: github/codeql-action/analyze@v2
         with:
-- 
cgit v1.2.3