Skip to content

Commit 5e69ce8

Browse files
authored
Merge branch 'main' into aeisenberg/multi-init
2 parents c8290d0 + fdb92bb commit 5e69ce8

11 files changed

Lines changed: 29 additions & 11 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
- Display a better error message when encountering a workflow that runs the `codeql-action/init` action multiple times. [#876](https://github.com/github/codeql-action/pull/876)
66

7+
## 1.0.29 - 21 Jan 2022
8+
9+
- The feature to wait for SARIF processing to complete after upload has been disabled by default due to a bug in its interaction with pull requests from forks.
10+
711
## 1.0.28 - 18 Jan 2022
812

913
- Update default CodeQL bundle version to 2.7.5. [#866](https://github.com/github/codeql-action/pull/866)

analyze/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ inputs:
5555
wait-for-processing:
5656
description: If true, the Action will wait for the uploaded SARIF to be processed before completing.
5757
required: true
58-
default: "true"
58+
default: "false"
5959
token:
6060
default: ${{ github.token }}
6161
matrix:

lib/codeql.js

Lines changed: 8 additions & 1 deletion
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.

node_modules/.package-lock.json

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

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "codeql",
3-
"version": "1.0.29",
3+
"version": "1.0.30",
44
"private": true,
55
"description": "CodeQL action",
66
"scripts": {

runner/package-lock.json

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

runner/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "codeql-runner",
3-
"version": "1.0.29",
3+
"version": "1.0.30",
44
"private": true,
55
"description": "CodeQL runner",
66
"scripts": {

src/codeql.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,12 @@ async function getCodeQLForCmd(
805805
await toolrunnerErrorCatcher(cmd, args, errorMatchers);
806806
},
807807
async resolveLanguages() {
808-
const codeqlArgs = ["resolve", "languages", "--format=json"];
808+
const codeqlArgs = [
809+
"resolve",
810+
"languages",
811+
"--format=json",
812+
...getExtraOptionsFromEnv(["resolve", "languages"]),
813+
];
809814
const output = await runTool(cmd, codeqlArgs);
810815

811816
try {
@@ -956,6 +961,7 @@ async function getCodeQLForCmd(
956961
"cleanup",
957962
databasePath,
958963
`--mode=${cleanupLevel}`,
964+
...getExtraOptionsFromEnv(["database", "cleanup"]),
959965
];
960966
await runTool(cmd, codeqlArgs);
961967
},
@@ -970,6 +976,7 @@ async function getCodeQLForCmd(
970976
databasePath,
971977
`--output=${outputFilePath}`,
972978
`--name=${databaseName}`,
979+
...getExtraOptionsFromEnv(["database", "bundle"]),
973980
];
974981
await new toolrunner.ToolRunner(cmd, args).exec();
975982
},

0 commit comments

Comments
 (0)