Repository navigation
Sync main with NordSecurity upstream - #6
Closed
alan-george-lk wants to merge 2 commits into
Closed
alan-george-lk wants to merge 2 commits into
alan-george-lk wants to merge 2 commits into
Conversation
Signed-off-by: Ernesto Domingo Fuentes <ernesto.fuentes@nordsec.com>
Update bindgen to UniFFI v0.31.0
|
|
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
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.
The fork's main is two commits behind NordSecurity/main. This branch points to upstream commit c592133 and includes the UniFFI v0.31.0 update and its upstream merge commit.
A direct fast-forward sync was rejected by LiveKit's organization ruleset
default(4151996), which requires a reviewed pull request and linear history. Upstream's merge commit violates the linear-history rule.To preserve identical upstream history, an organization administrator must permit the fast-forward sync through an authorized ruleset bypass or exception. Squashing or rebasing this PR can bring over the changes, but will leave the fork with different commit history from upstream. A normal merge also creates a different tip.
Validation: fetched both remotes and verified fork main is 0 commits ahead and 2 behind upstream. No source changes were made; local tests were not rerun. The working checkout remains on livekit/dev.