Merge releases/v3 into releases/v2 #2240
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}
I've left a few warning logging cases, but overall this feature is no longer supported.
Mergeback v3.24.10 refs/heads/releases/v3 into main
This ensures that if there is a database already in the filesystem, we can gracefully handle creating a new one. This sometimes happens when a user is on a self-hosted runner and neglects to clean state across runs.
I think we can delete this logic too, but let's deal with that in a separate PR
See github/codeql#16127 (which will be released as part of 2.17.1)
Co-authored-by: Henry Mercer <[email protected]>
Co-authored-by: Henry Mercer <[email protected]>
Add the overwrite flag when init-ing databases
Co-authored-by: Henry Mercer <[email protected]>
CI: apply `setup-swift` workaround
github-actions
bot
added
the
Update dependencies
henrymercer
added
Update dependencies
github-actions
bot
removed
the
Update dependencies
|
Pushed a commit to update the checked-in dependencies. Please mark the PR as ready for review to trigger PR checks. |
henrymercer
force-pushed
the
backport-v2.25.0-df5a14dc2
branch
from
8b69691
to
b9d7925
Compare
henrymercer
approved these changes
Apr 15, 2024
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 df5a14d into
releases/v2.Conductor for this PR is @henrymercer.
Contains the following pull requests:
setup-swiftworkaround #2231 (@henrymercer)fileprogram is not installed on the runner #2234 (@mbg)Please do the following:
releases/v2branch.Create a merge commitis selected rather thanSquash and mergeorRebase and merge.