Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build manpage archive deterministically #8600

Merged
merged 1 commit into from
Aug 10, 2020

Conversation

alexcrichton
Copy link
Member

@alexcrichton alexcrichton commented Aug 7, 2020

Keep deterministic builds for Cargo!

Closes #8599

@rust-highfive
Copy link

r? @Eh2406

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 7, 2020
@alexcrichton alexcrichton changed the title Deterministic Build manpage archive deterministically Aug 7, 2020
@ehuss
Copy link
Contributor

ehuss commented Aug 9, 2020

Thanks, didn't know about that option!

Should the entries from fs::read_dir be sorted?

Keep deterministic builds for Cargo! The changes here are:

* Sort files being added to the archive to ensure they're added in the
  same order on all platforms.
* Flag the archive builder as "deterministic mode" which means it won't
  pick up fields like mtime.

Closes rust-lang#8599
@alexcrichton
Copy link
Member Author

Aha excellent point, sorting now added too.

@ehuss
Copy link
Contributor

ehuss commented Aug 10, 2020

Thanks! I wasn't sure if reproducible build environments typically used a special filesystem or not.

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 10, 2020

📌 Commit 624acc8 has been approved by ehuss

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 10, 2020
@bors
Copy link
Collaborator

bors commented Aug 10, 2020

⌛ Testing commit 624acc8 with merge ab32ee8...

@bors
Copy link
Collaborator

bors commented Aug 10, 2020

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing ab32ee8 to master...

@bors bors merged commit ab32ee8 into rust-lang:master Aug 10, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Aug 13, 2020
Update cargo

7 commits in 1653f354644834073d6d2541e27fae94588e685e..ab32ee88dade1b50c77347599e82ca2de3fb8a51
2020-08-04 23:14:37 +0000 to 2020-08-10 17:44:43 +0000
- Build manpage archive deterministically (rust-lang/cargo#8600)
- doc: Qualify GNU licenses in example license field (rust-lang/cargo#8604)
- Fix jobserver_exists test on single-cpu systems (rust-lang/cargo#8598)
- Fix small typo in reference/profiles.md (rust-lang/cargo#8605)
- Default cargo publish to the alt registry if it's the only allowed one (rust-lang/cargo#8571)
- cargo install with specific yanked version gives confusing "not found" error (rust-lang/cargo#8565)
- Fix typo (rust-lang/cargo#8589)
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 13, 2020
Update cargo

7 commits in 1653f354644834073d6d2541e27fae94588e685e..ab32ee88dade1b50c77347599e82ca2de3fb8a51
2020-08-04 23:14:37 +0000 to 2020-08-10 17:44:43 +0000
- Build manpage archive deterministically (rust-lang/cargo#8600)
- doc: Qualify GNU licenses in example license field (rust-lang/cargo#8604)
- Fix jobserver_exists test on single-cpu systems (rust-lang/cargo#8598)
- Fix small typo in reference/profiles.md (rust-lang/cargo#8605)
- Default cargo publish to the alt registry if it's the only allowed one (rust-lang/cargo#8571)
- cargo install with specific yanked version gives confusing "not found" error (rust-lang/cargo#8565)
- Fix typo (rust-lang/cargo#8589)
@ehuss ehuss added this to the 1.47.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Building cargo itself is non-reproducible
5 participants