Cherry-pick security updates and patches from main to 1.1 branch#128
Merged
feiyangliu2023 merged 8 commits into1.1from Feb 3, 2026
Merged
Cherry-pick security updates and patches from main to 1.1 branch#128feiyangliu2023 merged 8 commits into1.1from
feiyangliu2023 merged 8 commits into1.1from
Conversation
chunqilu
approved these changes
Feb 3, 2026
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
3 participants
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.
Issue
D386927144
Description of Changes
This PR cherry-picks changes from main (Code-OSS 1.101.2) to 1.1 (Code-OSS 1.108.2) and resolves conflicts arising from the different upstream versions.
Build Infrastructure:
Fix OOM during build by freeing disk space and adding swap
####Related commit:
Build on ubuntu-22.04 and fix the SageMaker UI post-startup patch (#121)
Patches & Overrides:
Update patches to fix cherry-picking errors and patch rebase conflicts
Fix patch errors from cherry-picking updates
Update package-lock.json overrides for all targets
####Related commit:
Add SageMaker version patch (#123)
Override undici for remote distribution (#118)
###Third-Party Licensing:
Update unified OSS attribution
Update approved packages for successful third-party-license generation
Conflict Resolution
Resolved conflicts in patches and package-lock overrides due to differences between Code-OSS base versions (1.101.2 → 1.108.2).
Testing
Make sure the full build is successful and all build checks passes
Follow-up
After merging to 1.1, sync these changes back to main to keep both branches aligned.
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.