From fd4659dfd44a6d3e6f5dc156ab36990a85440ff6 Mon Sep 17 00:00:00 2001 From: Edoardo Pirovano Date: Tue, 21 Sep 2021 13:41:10 +0100 Subject: [PATCH 1/3] Bump default CodeQL version to 2.6.2 bundle --- CHANGELOG.md | 2 +- lib/defaults.json | 2 +- src/defaults.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e6d051fa7..9a046004f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## [UNRELEASED] -No user facing changes. +- Update default CodeQL bundle version to 2.6.2. [#746](https://github.com/github/codeql-action/pull/746) ## 1.0.14 - 09 Sep 2021 diff --git a/lib/defaults.json b/lib/defaults.json index a27e0321b9..bfc2ccfb73 100644 --- a/lib/defaults.json +++ b/lib/defaults.json @@ -1,3 +1,3 @@ { - "bundleVersion": "codeql-bundle-20210909" + "bundleVersion": "codeql-bundle-20210921" } diff --git a/src/defaults.json b/src/defaults.json index 3af5520c9f..a1e0205fb8 100644 --- a/src/defaults.json +++ b/src/defaults.json @@ -1,3 +1,3 @@ { - "bundleVersion": "codeql-bundle-20210909" + "bundleVersion": "codeql-bundle-20210921" } From 8caa0808ee0f5b47645a4537c2777e4753891a82 Mon Sep 17 00:00:00 2001 From: Edoardo Pirovano Date: Tue, 21 Sep 2021 14:46:08 +0100 Subject: [PATCH 2/3] Upload tracer logs --- .github/workflows/pr-checks.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 5ec9ba6ba6..67d1533631 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -213,6 +213,12 @@ jobs: $Env:CODEQL_EXTRACTOR_CSHARP_ROOT = "" & $Env:CODEQL_RUNNER dotnet build + - name: Upload tracer logs + uses: actions/upload-artifact@v2 + with: + name: tracer-logs + path: ./codeql-runner + - name: Run analyze run: | ../action/runner/dist/codeql-runner-win.exe analyze --repository $Env:GITHUB_REPOSITORY --commit $Env:GITHUB_SHA --ref $Env:GITHUB_REF --github-url $Env:GITHUB_SERVER_URL --github-auth ${{ github.token }} From 014d3ea60a6f59b1d17438f3d818f51162629736 Mon Sep 17 00:00:00 2001 From: Edoardo Pirovano Date: Tue, 21 Sep 2021 15:28:59 +0100 Subject: [PATCH 3/3] Don't use shared compilation --- .github/workflows/pr-checks.yml | 8 ++++---- tests/multi-language-repo/build.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 67d1533631..ce97ebb5a9 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -171,7 +171,7 @@ jobs: - name: Build code run: | . ./codeql-runner/codeql-env.sh - $CODEQL_RUNNER dotnet build + $CODEQL_RUNNER dotnet build /p:UseSharedCompilation=false - name: Run analyze run: | @@ -211,13 +211,13 @@ jobs: run: | cat ./codeql-runner/codeql-env.sh | Invoke-Expression $Env:CODEQL_EXTRACTOR_CSHARP_ROOT = "" - & $Env:CODEQL_RUNNER dotnet build + & $Env:CODEQL_RUNNER dotnet build /p:UseSharedCompilation=false - name: Upload tracer logs uses: actions/upload-artifact@v2 with: name: tracer-logs - path: ./codeql-runner + path: ./codeql-runner/compound-build-tracer.log - name: Run analyze run: | @@ -255,7 +255,7 @@ jobs: shell: bash run: | . ./codeql-runner/codeql-env.sh - $CODEQL_RUNNER dotnet build + $CODEQL_RUNNER dotnet build /p:UseSharedCompilation=false - name: Run analyze run: | diff --git a/tests/multi-language-repo/build.sh b/tests/multi-language-repo/build.sh index 363499ab7e..677a0f9c97 100755 --- a/tests/multi-language-repo/build.sh +++ b/tests/multi-language-repo/build.sh @@ -2,7 +2,7 @@ gcc -o main main.c -dotnet build +dotnet build -p:UseSharedCompilation=false javac Main.java