From 99c6e78fb4e7884a641636bb17f2dc618c8a21b9 Mon Sep 17 00:00:00 2001 From: Marc Ransome Date: Wed, 29 Mar 2023 23:09:04 +0100 Subject: [PATCH 1/4] Update CodeQL configuration --- .github/workflows/codeql-analysis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a9afca9..c743d74 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -20,15 +20,17 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3 + - name: Install dependencies + run: brew install popt - name: Initialize CodeQL uses: github/codeql-action/init@v2 with: languages: cpp queries: security-and-quality - - name: Install dependencies and build project + - name: Build sources run: | - brew install pkg-config popt cmake -S . -B build cmake --build build + cd src - name: Perform CodeQL analysis uses: github/codeql-action/analyze@v2 From 2cbe7700a6d0e533ded250e1ecffd449c5be9931 Mon Sep 17 00:00:00 2001 From: Marc Ransome Date: Wed, 29 Mar 2023 23:23:24 +0100 Subject: [PATCH 2/4] Update dependency step and build CodeQL steps --- .github/workflows/codeql-analysis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c743d74..1353806 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -21,7 +21,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - name: Install dependencies - run: brew install popt + run: brew install pkg-config popt - name: Initialize CodeQL uses: github/codeql-action/init@v2 with: @@ -31,6 +31,6 @@ jobs: run: | cmake -S . -B build cmake --build build - cd src + cp -r src/* /build/src/ - name: Perform CodeQL analysis uses: github/codeql-action/analyze@v2 From 340596977afa4b527f6d7338a1f9299a910b909b Mon Sep 17 00:00:00 2001 From: Marc Ransome Date: Wed, 29 Mar 2023 23:26:55 +0100 Subject: [PATCH 3/4] Remove unnecessary CodeQL dependency --- .github/workflows/codeql-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 1353806..b92912e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -21,7 +21,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - name: Install dependencies - run: brew install pkg-config popt + run: brew install popt - name: Initialize CodeQL uses: github/codeql-action/init@v2 with: From e92330c06f89eca7de8299e7cb4b7b74b198a053 Mon Sep 17 00:00:00 2001 From: Marc Ransome Date: Wed, 29 Mar 2023 23:28:01 +0100 Subject: [PATCH 4/4] Fix relative path in CodeQL workflow --- .github/workflows/codeql-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b92912e..560d9a6 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -31,6 +31,6 @@ jobs: run: | cmake -S . -B build cmake --build build - cp -r src/* /build/src/ + cp -r src/* build/src/ - name: Perform CodeQL analysis uses: github/codeql-action/analyze@v2