Fix the merge into releases/v2 #1308
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Mergeback v2.1.26 refs/heads/releases/v2 into main
Co-authored-by: GitHub <[email protected]>
TRAP Caching: Add timeouts to upload/download operations
It's possible to determine this otherwise, but this makes it easier to spot.
The user config parser in the CLI doesn't yet support it.
Add logging statements declaring state of the cli_config_file_enabled
* Correctly report CodeQL version when using cache * Add JS generated files * Add test for return value of `setupCodeQL` * Fill in missing return value comment
Convert "Invalid source root" errors to UserErrors
* Add changelog note for Go extraction reconciliation * Update CHANGELOG.md Co-authored-by: Henry Mercer <[email protected]> * Update CHANGELOG.md Co-authored-by: Andrew Eisenberg <[email protected]> * Tweaks from PR review Co-authored-by: Henry Mercer <[email protected]> Co-authored-by: Andrew Eisenberg <[email protected]>
henrymercer
approved these changes
Oct 17, 2022
|
Note that we should be careful when backporting this to |
8 tasks
This was referenced Oct 17, 2022
This was referenced Nov 29, 2023
This was referenced Nov 29, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR re-merges main@e4cc4a2f into releases/v2. It fixes an accidental squash merge from main into releases/v2.