Merge pull request #837 from github/aeisenberg/cli-2.7.3
Bump default CodeQL version to 2.7.3
This commit is contained in:
commit
eebe7c46f1
7 changed files with 30 additions and 6 deletions
3
.github/workflows/pr-checks.yml
vendored
3
.github/workflows/pr-checks.yml
vendored
|
|
@ -370,6 +370,9 @@ jobs:
|
|||
run: |
|
||||
../action/runner/dist/codeql-runner-macos init --repository $GITHUB_REPOSITORY --languages csharp --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
|
||||
|
||||
- name: Initialize dotnet
|
||||
run: dotnet restore
|
||||
|
||||
- name: Build code
|
||||
shell: bash
|
||||
run: |
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
## [UNRELEASED]
|
||||
|
||||
No user facing changes.
|
||||
- Update default CodeQL bundle version to 2.7.3. [#837](https://github.com/github/codeql-action/pull/837)
|
||||
|
||||
## 1.0.25 - 06 Dec 2021
|
||||
|
||||
|
|
|
|||
13
lib/codeql.js
generated
13
lib/codeql.js
generated
|
|
@ -461,7 +461,18 @@ async function getCodeQLForCmd(cmd, checkVersion) {
|
|||
"-Dhttp.keepAlive=false",
|
||||
"-Dmaven.wagon.http.pool=false",
|
||||
].join(" ");
|
||||
await runTool(autobuildCmd);
|
||||
const runnerExecutable = process.env["CODEQL_RUNNER"] || "";
|
||||
// On Mac, prefixing with the runner executable is required to handle System Integrity Protection.
|
||||
if (runnerExecutable) {
|
||||
// Earlier steps (init) are expected to have written the runner executable path
|
||||
// to the tracing environment, and the current step is expected to have
|
||||
// correctly loaded that environment.
|
||||
await runTool(runnerExecutable, [autobuildCmd]);
|
||||
}
|
||||
else {
|
||||
// Fallback in case CODEQL_RUNNER wasn't correctly set or loaded.
|
||||
await runTool(autobuildCmd);
|
||||
}
|
||||
},
|
||||
async extractScannedLanguage(databasePath, language) {
|
||||
// Get extractor location
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
"bundleVersion": "codeql-bundle-20211122"
|
||||
"bundleVersion": "codeql-bundle-20211207"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -732,7 +732,17 @@ async function getCodeQLForCmd(
|
|||
"-Dmaven.wagon.http.pool=false",
|
||||
].join(" ");
|
||||
|
||||
await runTool(autobuildCmd);
|
||||
const runnerExecutable = process.env["CODEQL_RUNNER"] || "";
|
||||
// On Mac, prefixing with the runner executable is required to handle System Integrity Protection.
|
||||
if (runnerExecutable) {
|
||||
// Earlier steps (init) are expected to have written the runner executable path
|
||||
// to the tracing environment, and the current step is expected to have
|
||||
// correctly loaded that environment.
|
||||
await runTool(runnerExecutable, [autobuildCmd]);
|
||||
} else {
|
||||
// Fallback in case CODEQL_RUNNER wasn't correctly set or loaded.
|
||||
await runTool(autobuildCmd);
|
||||
}
|
||||
},
|
||||
async extractScannedLanguage(databasePath: string, language: Language) {
|
||||
// Get extractor location
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
"bundleVersion": "codeql-bundle-20211122"
|
||||
"bundleVersion": "codeql-bundle-20211207"
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue