COR-181 - Take zlib from the mailcore2 release instead of S3 - #3
Closed
dbezverkhnii wants to merge 1 commit into
Closed
COR-181 - Take zlib from the mailcore2 release instead of S3#3dbezverkhnii wants to merge 1 commit into
dbezverkhnii wants to merge 1 commit into
Conversation
zlib was fetched from the spark-prebuilt-binaries S3 bucket behind
SPARK_PREBUILT_KEY. The same binary is now a public asset on the mailcore2
windows-prebuilt release, so the download needs no credential.
Both copies of Build-Zip.ps1 are changed, so nothing here reads the key any
more. The layout minizip expects - include, lib, and lib64/zlib.{dll,pdb,lib,exp}
- is what the archive carries under zlib/, so zlib_DIR is a drop-in swap.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Author
|
Closing: we decided to keep Leaving the branch in place — the swap is verified (the zlib in |
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.
Build-Zip.ps1fetchedzlib.zipfrom thespark-prebuilt-binariesS3 bucket, authenticating withSPARK_PREBUILT_KEYand throwing when it was unset. That was the last thing in the Spark Windows build still reaching for AWS: mailcore2 moved off it in readdle/mailcore2#104, and removing the secret from the spark-core-mono workflows made this script fail.The same zlib binary now travels as a public asset on the mailcore2
windows-prebuiltrelease —mailcore2-windows-deps-1.zip, the very archive mailcore2 itself builds against. Downloading it takes no credential.Why the swap is exact
Zip/minizip/CMakeLists.txtconsumeszlib_DIRas${zlib_DIR}/include,${zlib_DIR}/lib, and${zlib_DIR}/lib64/zlib.{dll,pdb,lib,exp}. The archive carries all four undermailcore2-windows-deps/zlib/, the same layoutzlib-win32-1always had — mailcore2 readsincludeandlib64from that exact directory. Only the path changes; the bytes and the CMake contract do not.Notes
build-scripts/Windows-5.10/and the legacybuild-scripts/Windows/— so nothing in this repository readsSPARK_PREBUILT_KEYany more.2.1.1.5), so nothing changes for anyone until a new tag is cut and that pin is bumped.Verification
Confirmed by inspection and by downloading the asset anonymously; the archive contains the four required paths. Not yet run on a Windows machine — the real check is a spark-core-mono CD run against a new tag, which needs this merged and tagged first.
Note
Low Risk
Build-script-only change for Windows Zip dependencies; removes a secret requirement but relies on a public third-party release URL and correct archive layout.
Overview
Windows Zip builds no longer download
zlib.zipfrom Spark’s S3 bucket or requireSPARK_PREBUILT_KEY. Bothbuild-scripts/Windows-5.10/Build-Zip.ps1andbuild-scripts/Windows/Build-Zip.ps1now pull the publicmailcore2-windows-deps-1.zipfrom the mailcore2windows-prebuiltGitHub release and pointzlib_DIRatmailcore2-windows-deps/zlib(same include/lib/lib64 layout minizip’s CMake already expects).The setup step downloads the new archive, removes any prior
mailcore2-windows-depstree before unpacking (so stale files aren’t reused), then expands into the dependencies folder. Only the source URL and paths change; the zlib binary and CMake contract stay aligned with mailcore2.Reviewed by Cursor Bugbot for commit 9189dfe. Bugbot is set up for automated code reviews on this repo. Configure here.