Skip to content

Commit

Permalink
Merge pull request #837 from github/aeisenberg/cli-2.7.3
Browse files Browse the repository at this point in the history
Bump default CodeQL version to 2.7.3
  • Loading branch information
Andrew Eisenberg authored and GitHub committed Dec 8, 2021
2 parents 0dbcb55 + dc32d54 commit eebe7c4
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/pr-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
13 changes: 12 additions & 1 deletion lib/codeql.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/codeql.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/defaults.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"bundleVersion": "codeql-bundle-20211122"
"bundleVersion": "codeql-bundle-20211207"
}
12 changes: 11 additions & 1 deletion src/codeql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/defaults.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"bundleVersion": "codeql-bundle-20211122"
"bundleVersion": "codeql-bundle-20211207"
}

0 comments on commit eebe7c4

Please sign in to comment.