Skip to content

Commit cbed035

Browse files
authored
Merge pull request #839 from github/revert-837-aeisenberg/cli-2.7.3
Revert "Bump default CodeQL version to 2.7.3"
2 parents eebe7c4 + a8cf6f4 commit cbed035

File tree

7 files changed

+6
-30
lines changed

7 files changed

+6
-30
lines changed

.github/workflows/pr-checks.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -370,9 +370,6 @@ jobs:
370370
run: |
371371
../action/runner/dist/codeql-runner-macos init --repository $GITHUB_REPOSITORY --languages csharp --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
372372
373-
- name: Initialize dotnet
374-
run: dotnet restore
375-
376373
- name: Build code
377374
shell: bash
378375
run: |

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [UNRELEASED]
44

5-
- Update default CodeQL bundle version to 2.7.3. [#837](https://github.com/github/codeql-action/pull/837)
5+
No user facing changes.
66

77
## 1.0.25 - 06 Dec 2021
88

lib/codeql.js

Lines changed: 1 addition & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/codeql.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/defaults.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"bundleVersion": "codeql-bundle-20211207"
2+
"bundleVersion": "codeql-bundle-20211122"
33
}

src/codeql.ts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -732,17 +732,7 @@ async function getCodeQLForCmd(
732732
"-Dmaven.wagon.http.pool=false",
733733
].join(" ");
734734

735-
const runnerExecutable = process.env["CODEQL_RUNNER"] || "";
736-
// On Mac, prefixing with the runner executable is required to handle System Integrity Protection.
737-
if (runnerExecutable) {
738-
// Earlier steps (init) are expected to have written the runner executable path
739-
// to the tracing environment, and the current step is expected to have
740-
// correctly loaded that environment.
741-
await runTool(runnerExecutable, [autobuildCmd]);
742-
} else {
743-
// Fallback in case CODEQL_RUNNER wasn't correctly set or loaded.
744-
await runTool(autobuildCmd);
745-
}
735+
await runTool(autobuildCmd);
746736
},
747737
async extractScannedLanguage(databasePath: string, language: Language) {
748738
// Get extractor location

src/defaults.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"bundleVersion": "codeql-bundle-20211207"
2+
"bundleVersion": "codeql-bundle-20211122"
33
}

0 commit comments

Comments
 (0)