Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
9885f86
Re-enable waiting for processing by default, using the new API semant…
chrisgavin Mar 30, 2022
792bbfe
Update changelog and version after v2.1.8
invalid-email-address Apr 8, 2022
0c80741
Update checked-in dependencies
invalid-email-address Apr 8, 2022
2d80fe8
Merge pull request #1029 from github/mergeback/v2.1.8-to-main-1ed14374
edoardopirovano Apr 8, 2022
b0c570e
autobuild: add working-directory input
cklin Apr 8, 2022
6f17408
Add autobuild workind-directory test
cklin Apr 8, 2022
baf90d1
Merge pull request #1024 from cklin/autobuild-working-dir
cklin Apr 8, 2022
780f4ee
Add codeql-python as CODEOWNERS
RasmusWL Apr 12, 2022
9f20add
Update CODEOWNERS
RasmusWL Apr 12, 2022
7a12645
Merge pull request #1030 from github/RasmusWL/pyton-setup-codeowners
henrymercer Apr 12, 2022
e7869d5
Merge main into wait-for-processing-2.
chrisgavin Apr 14, 2022
c5c5bda
Merge pull request #1007 from github/wait-for-processing-2
chrisgavin Apr 14, 2022
f6312f1
Commit any conflicts during v1 backport to simplify release process
henrymercer Apr 13, 2022
b3bf557
Merge branch 'main' into henrymercer/handle-merge-conflicts-in-releases
henrymercer Apr 14, 2022
bac9320
Update description of "Tag release and merge back" workflow
henrymercer Apr 12, 2022
fce4a01
Update the major version tag within the release process
henrymercer Apr 12, 2022
bce749b
Improve consistency of variable references in Bash
henrymercer Apr 12, 2022
9daf1de
Update references to release branches
henrymercer Apr 12, 2022
3962f1b
Bump glob from 7.1.7 to 8.0.1
dependabot[bot] Apr 14, 2022
0ba58d8
Update checked-in dependencies
invalid-email-address Apr 14, 2022
8b2f5d7
Merge pull request #1034 from github/dependabot/npm_and_yarn/glob-8.0.1
henrymercer Apr 14, 2022
faf9d4b
Merge branch 'main' into henrymercer/use-tags-for-releases
henrymercer Apr 14, 2022
5b5ed44
Add a PR check to check for conflict markers
henrymercer Apr 14, 2022
808c292
Support Pipfile without Pipfile.lock
kojiromike Apr 8, 2022
b9577df
python-setup: refactor Pipenv without lockfile
RasmusWL Apr 12, 2022
e6e3277
Merge pull request #1026 from kojiromike/patch-1
aeisenberg Apr 18, 2022
23b7196
Bump default CodeQL version to 2.9.0
hmakholm Apr 21, 2022
e87e2d8
Merge branch 'main' into henrymercer/use-tags-for-releases
henrymercer Apr 25, 2022
ce63ab5
Merge pull request #1033 from github/henrymercer/use-tags-for-releases
henrymercer Apr 25, 2022
074853a
Suggest resolving conflicts by adding new commits vs amending the mer…
henrymercer Apr 25, 2022
2b8fdb3
Merge branch 'main' into henrymercer/handle-merge-conflicts-in-releases
henrymercer Apr 25, 2022
80771fd
Merge branch 'main' into hmakholm/pr/2.9.0
hmakholm Apr 26, 2022
95b49c3
Merge pull request #1038 from github/hmakholm/pr/2.9.0
hmakholm Apr 26, 2022
d2d14ad
Merge branch 'main' into henrymercer/handle-merge-conflicts-in-releases
henrymercer Apr 26, 2022
bf4ba69
README: Replace git.io shortlink with full link
adityasharad Apr 26, 2022
c76f0b5
Merge pull request #1032 from github/henrymercer/handle-merge-conflic…
henrymercer Apr 26, 2022
eed184a
Merge branch 'main' into adityasharad/readme/replace-git-io
henrymercer Apr 26, 2022
ff8b365
Merge pull request #1044 from github/adityasharad/readme/replace-git-io
henrymercer Apr 26, 2022
6dd9baf
Fix status reporting error on Windows
cklin Apr 25, 2022
7286114
Merge pull request #1042 from cklin/windows-status-report-error
cklin Apr 26, 2022
cbce00d
Update changelog for v2.1.9
invalid-email-address Apr 27, 2022
7502d6e
Merge pull request #1046 from github/update-v2.1.9-72861144
hmakholm Apr 27, 2022
acf17f7
Revert "Update version and changelog for v1.1.8"
invalid-email-address Apr 27, 2022
f703d1c
Revert "Update checked-in dependencies"
invalid-email-address Apr 27, 2022
d9937ad
Merge remote-tracking branch 'origin/releases/v2' into update-v1.1.9-…
invalid-email-address Apr 27, 2022
e34f3ea
Update version and changelog for v1.1.9
invalid-email-address Apr 27, 2022
e3983ef
Update checked-in dependencies
invalid-email-address Apr 27, 2022
8371fda
manually resolve conflict in favor of node12 for v1
hmakholm Apr 27, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Re-enable waiting for processing by default, using the new API semant…
…ics.
  • Loading branch information
chrisgavin committed Mar 30, 2022
commit 9885f86fab4879632b7e44514f19148225dfbdcd
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

- [v2+ only] The CodeQL Action now runs on Node.js v16. [#1000](https://github.com/github/codeql-action/pull/1000)
- Update default CodeQL bundle version to 2.8.4. [#990](https://github.com/github/codeql-action/pull/990)
- The `analyze` and `upload-sarif` actions will now wait up to 2 minutes for processing to complete after they have uploaded the results so they can report any processing errors that occurred. This behavior can be disabled by setting the `wait-for-processing` action input to `"false"`. [#1007](https://github.com/github/codeql-action/pull/1007)

## 1.1.5 - 15 Mar 2022

Expand Down
2 changes: 1 addition & 1 deletion analyze/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ inputs:
wait-for-processing:
description: If true, the Action will wait for the uploaded SARIF to be processed before completing.
required: true
default: "false"
default: "true"
token:
default: ${{ github.token }}
matrix:
Expand Down
16 changes: 4 additions & 12 deletions lib/upload-lib.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/upload-lib.js.map

Large diffs are not rendered by default.

16 changes: 5 additions & 11 deletions src/upload-lib.ts
Original file line number Diff line number Diff line change
Expand Up @@ -485,23 +485,17 @@ export async function waitForProcessing(
logger.info(`Analysis upload status is ${status}.`);
if (status === "complete") {
break;
} else if (status === "pending") {
logger.debug("Analysis processing is still pending...");
} else if (status === "failed") {
throw new Error(
`Code Scanning could not process the submitted SARIF file:\n${response.data.errors}`
);
}
} catch (e) {
if (util.isHTTPError(e)) {
switch (e.status) {
case 404:
logger.debug("Analysis is not found yet...");
break; // Note this breaks from the case statement, not the outer loop.
default:
throw e;
}
} else {
throw e;
}
logger.warning(
`An error occurred checking the status of the delivery. ${e} It should still be processed in the background, but errors that occur during processing may not be reported.`
);
}
await util.delay(STATUS_CHECK_FREQUENCY_MILLISECONDS);
}
Expand Down
2 changes: 1 addition & 1 deletion upload-sarif/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ inputs:
wait-for-processing:
description: If true, the Action will wait for the uploaded SARIF to be processed before completing.
required: true
default: "false"
default: "true"
outputs:
sarif-id:
description: The ID of the uploaded SARIF file.
Expand Down