Upgrade vendored Brotli dependency to v1.1.0 #106994
Conversation
jkoritzinsky
force-pushed
the
simple-brotli-upgrade
branch
from
f0d8c39
to
72356a9
Compare
|
/azp run runtime, runtime-community, runtime-extra-platforms, runtime-nativeaot-outerloop |
|
Azure Pipelines successfully started running 4 pipeline(s). |
|
/backport to release/9.0 |
|
/backport to release/8.0-staging |
|
Started backporting to release/9.0: https://github.com/dotnet/runtime/actions/runs/10602456102 |
|
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/10602458617 |
|
@jkoritzinsky backporting to release/9.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Upgrade vendored Brotli dependency to v1.1.0
Using index info to reconstruct a base tree...
M src/native/libs/System.IO.Compression.Native/CMakeLists.txt
Falling back to patching base and 3-way merge...
Auto-merging src/native/libs/System.IO.Compression.Native/CMakeLists.txt
CONFLICT (content): Merge conflict in src/native/libs/System.IO.Compression.Native/CMakeLists.txt
Removing src/native/external/brotli/tools/brotli.md
Removing src/native/external/brotli/tools/brotli.c
Removing src/native/external/brotli/fuzz/test_fuzzer.sh
Removing src/native/external/brotli/fuzz/run_decode_fuzzer.c
Removing src/native/external/brotli/fuzz/decode_fuzzer.c
Removing src/native/external/brotli/common/dictionary.bin.br
Removing src/native/external/brotli/common/dictionary.bin
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Upgrade vendored Brotli dependency to v1.1.0
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@jkoritzinsky an error occurred while backporting to release/9.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
|
@jkoritzinsky backporting to release/8.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Upgrade vendored Brotli dependency to v1.1.0
Using index info to reconstruct a base tree...
M src/native/external/brotli.cmake
M src/native/external/cgmanifest.json
M src/native/libs/System.IO.Compression.Native/CMakeLists.txt
Falling back to patching base and 3-way merge...
Auto-merging src/native/libs/System.IO.Compression.Native/CMakeLists.txt
CONFLICT (content): Merge conflict in src/native/libs/System.IO.Compression.Native/CMakeLists.txt
Auto-merging src/native/external/cgmanifest.json
Removing src/native/external/brotli/tools/brotli.md
Removing src/native/external/brotli/tools/brotli.c
Removing src/native/external/brotli/fuzz/test_fuzzer.sh
Removing src/native/external/brotli/fuzz/run_decode_fuzzer.c
Removing src/native/external/brotli/fuzz/decode_fuzzer.c
Removing src/native/external/brotli/common/dictionary.bin.br
Removing src/native/external/brotli/common/dictionary.bin
Auto-merging src/native/external/brotli.cmake
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Upgrade vendored Brotli dependency to v1.1.0
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@jkoritzinsky an error occurred while backporting to release/8.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
| 1.1.0 | ||
| https://github.com/google/brotli/releases/tag/v1.1.0 | ||
|
|
||
| Copy the c/dec, c/enc, c/common, and c/include folders into the root and remove all other files. |
There was a problem hiding this comment.
We should probably create a script to do this, if we are going to selectively copy stuff. Previously, the idea was to keep these external dependencies as-is, so it's easy to compare/review during the updates.
There was a problem hiding this comment.
I'm planning (and have a branch locally that I need to update) that will bring us in alignment with how we handle other dependencies.
Fixes #106887