Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge releases/v3 into releases/v2 #2228

Merged
merged 52 commits into from
Apr 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
7cdd972
Update changelog and version after v3.24.9
github-actions[bot] Mar 22, 2024
ca4079b
Update checked-in dependencies
github-actions[bot] Mar 22, 2024
3d81734
Merge pull request #2209 from github/mergeback/v3.24.9-to-main-1b1aada4
aibaars Mar 22, 2024
a12b868
Create feature flag for merging SARIF files using the CLI
koesie10 Mar 15, 2024
ccc609b
Use github merge-results command when feature flag is enabled
koesie10 Mar 15, 2024
7e30c62
Use subdirectory for combined SARIF file
koesie10 Mar 18, 2024
2bbafcd
Upload debug artifacts for upload-sarif
koesie10 Mar 18, 2024
e20c273
Use supportsFeature check for merging SARIF files
koesie10 Mar 22, 2024
6ac5753
Use options object instead of boolean for mergeResults
koesie10 Mar 25, 2024
70aa50b
Use runTool for mergeResults
koesie10 Mar 25, 2024
3bd271c
Introduce areAllRunsProducedByCodeQL function
koesie10 Mar 25, 2024
a0a63a2
Do not try merging a single SARIF file
koesie10 Mar 25, 2024
3c4b8bc
Change log levels
koesie10 Mar 25, 2024
82b82e5
Only upload combined SARIF files when env var is set
koesie10 Mar 25, 2024
155888c
Bump the npm group with 3 updates
dependabot[bot] Mar 25, 2024
a99c623
Update checked-in dependencies
github-actions[bot] Mar 25, 2024
956f09c
Merge pull request #2211 from github/dependabot/npm_and_yarn/npm-2d63…
angelapwen Mar 25, 2024
58194bf
Do not require debug mode for debugging uploads
koesie10 Mar 26, 2024
f835435
Rename run to uploadArtifacts
koesie10 Mar 26, 2024
016720d
Refactor areAllRunsProducedByCodeQL to use Array.every
koesie10 Mar 26, 2024
84ba7fb
Merge pull request #2199 from github/koesie10/cli-sarif-merge
koesie10 Mar 27, 2024
048b508
Bump the npm group with 2 updates
dependabot[bot] Apr 1, 2024
d7c4cc3
Update checked-in dependencies
github-actions[bot] Apr 1, 2024
99c9897
Merge pull request #2217 from github/dependabot/npm_and_yarn/npm-eb3e…
angelapwen Apr 1, 2024
f4936c4
Update default bundle to codeql-bundle-v2.17.0
github-actions[bot] Apr 2, 2024
ec214df
Add changelog note
github-actions[bot] Apr 2, 2024
eeaea14
Update supported GitHub Enterprise Server versions
github-actions[bot] Apr 3, 2024
eda4878
Only pass `--new-analysis-summary` if it is not default behavior
henrymercer Apr 3, 2024
f06c933
Update soon to be deprecated CodeQL version
henrymercer Apr 3, 2024
6514cbb
improve logging coverage when uploaing sarif files
nickfyson Apr 3, 2024
f8dd543
Add changelog note
henrymercer Apr 3, 2024
dcf00b3
Account for varying major version number in error message
henrymercer Apr 3, 2024
3bd9c3e
Merge pull request #2220 from github/update-supported-enterprise-serv…
henrymercer Apr 3, 2024
2cc8bbd
Apply suggestions from code review
nickfyson Apr 3, 2024
978bdd6
fix test that runs flakily locally
nickfyson Apr 3, 2024
d325762
fix linting error
nickfyson Apr 3, 2024
2654062
Merge branch 'main' into nickfyson/upload-logging
nickfyson Apr 3, 2024
d3c32a8
fix test to respect updated logging behaviour
nickfyson Apr 3, 2024
c037115
clarify logging in response to pr review comments
nickfyson Apr 3, 2024
65e69c8
Merge branch 'main' into update-bundle/codeql-bundle-v2.17.0
cklin Apr 4, 2024
278465c
Merge pull request #2219 from github/update-bundle/codeql-bundle-v2.17.0
cklin Apr 4, 2024
5f535de
Merge pull request #2221 from github/nickfyson/upload-logging
nickfyson Apr 4, 2024
f421cda
Run integration test PR checks nightly (#2222)
angelapwen Apr 4, 2024
7df281f
Gracefully continue if `createStatusReportBase` throws (#2225)
angelapwen Apr 4, 2024
3f041c5
Update changelog for v3.24.10
github-actions[bot] Apr 5, 2024
4355270
Merge pull request #2226 from github/update-v3.24.10-7df281f2f
cklin Apr 5, 2024
a1559aa
Revert "Update version and changelog for v2.24.9"
github-actions[bot] Apr 5, 2024
794eacf
Revert "Update checked-in dependencies"
github-actions[bot] Apr 5, 2024
a023017
Merge remote-tracking branch 'origin/releases/v3' into backport-v2.24…
github-actions[bot] Apr 5, 2024
93075ce
Update version and changelog for v2.24.10
github-actions[bot] Apr 5, 2024
2a96432
Resolve conflicts in codeql.ts
cklin Apr 5, 2024
82478fb
Update checked-in dependencies
github-actions[bot] Apr 5, 2024
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
88 changes: 45 additions & 43 deletions .github/workflows/__all-platform-bundle.yml

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

98 changes: 50 additions & 48 deletions .github/workflows/__analyze-ref-input.yml

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

116 changes: 59 additions & 57 deletions .github/workflows/__autobuild-action.yml

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

Loading
Loading