Merge releases/v2 into releases/v1 #1309
Merged
Conversation
This file contains 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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Mergeback v2.1.26 refs/heads/releases/v2 into main
Co-authored-by: GitHub <noreply@github.com>
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 <henrymercer@github.com> * Update CHANGELOG.md Co-authored-by: Andrew Eisenberg <aeisenberg@github.com> * Tweaks from PR review Co-authored-by: Henry Mercer <henrymercer@github.com> Co-authored-by: Andrew Eisenberg <aeisenberg@github.com>
Fix the merge into releases/v2
This reverts commit fe49f6c.
This reverts commit 54257f7.
github-actions
bot
added
the
Update dependencies
aeisenberg
added
Update dependencies
github-actions
bot
removed
the
Update dependencies
aeisenberg
added
the
Update dependencies
github-actions
bot
removed
the
Update dependencies
aeisenberg
force-pushed
the
update-v1.1.27-5dd73678
branch
from
a467405
to
a0e10fe
Compare
aeisenberg
added
the
Update dependencies
github-actions
bot
removed
the
Update dependencies
|
@henrymercer, I can no longer approve this PR since I pushed to it. Can you do it instead? |
henrymercer
approved these changes
Oct 17, 2022
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.
Merging 5dd7367 into releases/v1
Conductor for this PR is @aeisenberg.
Contains the following pull requests:
Please do the following: