Add install_only_stripped binaries to release
#279
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
charliermarsh
force-pushed
the
charlie/strip
branch
from
1a6d635
to
861ffb3
Compare
indygreg
reviewed
Jul 14, 2024
|
Thanks for the review, will revise. |
|
@indygreg - Did you have a specific approach in mind for getting |
|
Actually, I'll just do the bootstrapping in Rust as part of the release script. |
charliermarsh
force-pushed
the
charlie/strip
branch
2 times, most recently
from
e97e68c
to
68c26fd
Compare
charliermarsh
commented
Jul 14, 2024
|
|
||
| let llvm_dir = PathBuf::from("llvm"); | ||
|
|
||
| // If `llvm` is already available with the target version, return it. |
There was a problem hiding this comment.
We can also just store this in a temporary directory for the duration of the command. It's a little tedious when iterating locally, since LLVM is large and you then have to re-download every time, but I don't feel strongly about keeping this.
charliermarsh
force-pushed
the
charlie/strip
branch
from
68c26fd
to
b436a58
Compare
|
I would install the LLVM distributions this project already uses: those are known to work. But if you want to take a shortcut, since the release automation is done in GitHub Actions now, I believe the LLVM packages on Ubuntu should be able to strip Mach-O binaries as well. If it works, that's path of least resistance. |
|
👍 That’s what I opted for here — reusing the existing LLVM builds. |
indygreg
approved these changes
Jul 20, 2024
| fn llvm_strip(data: &[u8], llvm_dir: &Path) -> Result<Vec<u8>> { | ||
| let mut command = Command::new(llvm_dir.join("bin/llvm-strip")) | ||
| .arg("--strip-debug") | ||
| .arg("-") |
There was a problem hiding this comment.
Oh, I didn't realize you could feed input via stdin. That's a nifty feature!
Comment on lines
+453
to
+463
| if cfg!(target_os = "macos") { | ||
| if std::env::consts::ARCH == "aarch64" { | ||
| Url::parse("https://github.com/indygreg/toolchain-tools/releases/download/toolchain-bootstrap%2F20240713/llvm-18.0.8+20240713-aarch64-apple-darwin.tar.zst").unwrap() | ||
| } else if std::env::consts::ARCH == "x86_64" { | ||
| Url::parse("https://github.com/indygreg/toolchain-tools/releases/download/toolchain-bootstrap%2F20240713/llvm-18.0.8+20240713-x86_64-apple-darwin.tar.zst").unwrap() | ||
| } else { | ||
| panic!("unsupported macOS architecture"); | ||
| } | ||
| } else if cfg!(target_os = "linux") { | ||
| Url::parse("https://github.com/indygreg/toolchain-tools/releases/download/toolchain-bootstrap%2F20240713/llvm-18.0.8+20240713-gnu_only-x86_64-unknown-linux-gnu.tar.zst").unwrap() | ||
| } else { |
There was a problem hiding this comment.
I've long thought about moving the download URLs / digests into a YAML file so we're not editing Python sources to upgrade dependencies. That would open the door to automatically detecting and applying available updates. Now this code is a potential new consumer of that YAML file.
There was a problem hiding this comment.
I like that idea -- I'll do it separately.
Comment on lines
+497
to
+505
| while let Some(chunk) = bytes_stream.next().await { | ||
| tokio::io::copy(&mut chunk?.as_ref(), &mut tarball_file).await?; | ||
| } | ||
|
|
||
| // Decompress the tarball. | ||
| let tarball = std::fs::File::open(&tarball_path)?; | ||
| let tar = zstd::stream::Decoder::new(std::io::BufReader::new(tarball))?; | ||
| let mut archive = tar::Archive::new(tar); | ||
| archive.unpack(temp_dir.path())?; |
There was a problem hiding this comment.
There might be a way to do this without having to buffer the entire file first. But it's probably not worth the optimization.
charliermarsh
force-pushed
the
charlie/strip
branch
from
b436a58
to
d3c8cb8
Compare
|
Thanks for the great review! Regarding the docs: I didn't go as far as to recommend them over the |
indygreg
approved these changes
Jul 20, 2024
|
👍 I do the same in all of my own projects :) |
|
Before and after sizes:
Very impactful for Linux and Windows builds (nearly 50% for Windows), almost no impact on macOS interestingly. |
|
Hi @charliermarsh , thanks for this PR but I didn't see an obvious size change between
I guess something goes wrong? |
|
Apologies, I think I messed up the release and uploaded the non-stripped binaries under |
|
Fixing and cutting another release when builds complete: #291 |
zanieb
pushed a commit
to zanieb/python-build-standalone
that referenced
this pull request
Sep 4, 2024
This PR adds an `install_only_stripped` variant, which is generated by taking the `install_only` variant and removing debug symbols. Closes indygreg#277. Closes indygreg#174. Related to indygreg#275. On macOS: - Downloaded [cpython-3.10.14+20240713-aarch64-apple-darwin-install_only.tar.gz](https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.10.14+20240713-aarch64-apple-darwin-install_only.tar.gz) locally. - Ran: `cargo run convert-install-only-stripped cpython-3.10.14+20240713-aarch64-apple-darwin-install_only.tar.gz`. - Relocated `cpython-3.10.14+20240713-aarch64-apple-darwin-install_only_stripped.tar.gz` to another directory. - Unzipped `cpython-3.10.14+20240713-aarch64-apple-darwin-install_only.tar.gz`. - Ran `./python` in `python/python/bin`. Performed the same procedure on Windows.
This was referenced Sep 5, 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.
Summary
This PR adds an
install_only_strippedvariant, which is generated by taking theinstall_onlyvariant and removing debug symbols.Closes #277.
Closes #174.
Related to #275.
Test Plan
On macOS:
cargo run convert-install-only-stripped cpython-3.10.14+20240713-aarch64-apple-darwin-install_only.tar.gz.cpython-3.10.14+20240713-aarch64-apple-darwin-install_only_stripped.tar.gzto another directory.cpython-3.10.14+20240713-aarch64-apple-darwin-install_only.tar.gz../pythoninpython/python/bin.Performed the same procedure on Windows.