Skip to content

Add lockfile #1829

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

Merged
merged 1 commit into from
Jun 12, 2025
Merged

Add lockfile #1829

merged 1 commit into from
Jun 12, 2025

Conversation

Kobzol
Copy link
Contributor

@Kobzol Kobzol commented Jun 11, 2025

Needed to unblock rust-lang/rust#141899.

The problem is that on Rust's CI, we want to test at least compiling stdarch's core_arch and possibly run some tests (which are normally not part of stdlib). But on CI we run everything with --locked, so we need a lockfile.

An alternative is to include stdarch in the stdlib's workspace. However, if I understand it correctly, stdlib only uses std_detect, but we want to build also other crates (such as core_arch). So we would have to include all packages from stdarch that we want to build/test on rust's CI into the stdlib workspace, which I'm not sure is a good idea (?).

Happy to hear feedback!

@rustbot
Copy link
Collaborator

rustbot commented Jun 11, 2025

r? @Amanieu

rustbot has assigned @Amanieu.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@Amanieu
Copy link
Member

Amanieu commented Jun 12, 2025

This needs a rebase now that #1830 has landed.

@Kobzol
Copy link
Contributor Author

Kobzol commented Jun 12, 2025

Rebased and recreated the lockfile.

@Amanieu Amanieu enabled auto-merge June 12, 2025 05:23
@Amanieu Amanieu added this pull request to the merge queue Jun 12, 2025
Merged via the queue into rust-lang:master with commit 1b4d15d Jun 12, 2025
61 checks passed
@Kobzol Kobzol deleted the add-lockfile branch June 12, 2025 06:57
tgross35 added a commit to tgross35/rust that referenced this pull request Jun 12, 2025
Includes the following changes:

* Add s390x z17 target features [1]
* Remove `compiler-builtins` from `rustc-dep-of-std` dependencies [2]
* Darwin AArch64 detection update [3]
* Fixes for the latest nightly [4]
* Add a lockfile [5]

[1]: rust-lang/stdarch#1826
[2]: rust-lang/stdarch#1825
[3]: rust-lang/stdarch#1827
[4]: rust-lang/stdarch#1830
[5]: rust-lang/stdarch#1829
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants