Commonize uname -m results for aarch64 in docker runner#127828
Merged
bors merged 1 commit intorust-lang:masterfrom Jul 18, 2024
Merged
Commonize uname -m results for aarch64 in docker runner#127828bors merged 1 commit intorust-lang:masterfrom
uname -m results for aarch64 in docker runner#127828bors merged 1 commit intorust-lang:masterfrom
Conversation
Contributor
Author
|
Unfortunately this doesn't cover everything because it gives archive failures building with |
Contributor
|
FWIW, I had the same change in a local branch that I just didn't get around to pushing. It worked for me with the aarch64-gnu image. |
Contributor
Author
|
Thanks for confirming, great to know at least this bit works. Launching the aarch linux image with Didn't look into it too much since the message was pretty useless, hence #127830. I also didn't try running the full dist build since I might as well just use try jobs for that. |
onur-ozkan
approved these changes
Jul 17, 2024
Contributor
onur-ozkan
left a comment
There was a problem hiding this comment.
feel free to r=me with/without the nit suggestion
src/ci/docker/run.sh
Outdated
Comment on lines
+30
to
+34
| machine="$(uname -m)" | ||
| if [ "$machine" = "arm64" ]; then | ||
| # MacOS reports "arm64" while Linux reports "aarch64". Commonize this. | ||
| machine="aarch64" | ||
| fi |
Contributor
There was a problem hiding this comment.
nit
Suggested change
| machine="$(uname -m)" | |
| if [ "$machine" = "arm64" ]; then | |
| # MacOS reports "arm64" while Linux reports "aarch64". Commonize this. | |
| machine="aarch64" | |
| fi | |
| # MacOS reports "arm64" while Linux reports "aarch64". Commonize this. | |
| machine="$(uname -m | sed 's/arm64/aarch64/')" |
Contributor
Author
There was a problem hiding this comment.
Applied and double checked it works, thanks!
`uname -m` on Linux reports `aarch64`, but on MacOS reports `arm64`. Commonize this to `aarch64`. With this fix, it is now possible to run aarch64 CI docker images on Arm MacOS.
fd3c486 to
f3f0b57
Compare
Contributor
Author
|
@bors r=onur-ozkan rollup |
Collaborator
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jul 17, 2024
…nur-ozkan Commonize `uname -m` results for `aarch64` in docker runner `uname -m` on Linux reports `aarch64`, but on MacOS reports `arm64`. Commonize this to `aarch64`. With this fix, it is now possible to run aarch64 CI docker images on Arm MacOS.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 18, 2024
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#127542 ([`macro_metavar_expr_concat`] Add support for literals) - rust-lang#127652 (Unignore cg_gcc fmt) - rust-lang#127664 (Fix precise capturing suggestion for hidden regions when we have APITs) - rust-lang#127806 (Some parser improvements) - rust-lang#127828 (Commonize `uname -m` results for `aarch64` in docker runner) - rust-lang#127845 (unix: break `stack_overflow::install_main_guard` into smaller fn) - rust-lang#127854 (Add internal lint for detecting non-glob imports of `rustc_type_ir::inherent`) - rust-lang#127861 (Document the column numbers for the dbg! macro) - rust-lang#127875 (style-guide: Clarify version-sorting) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 18, 2024
Rollup of 9 pull requests Successful merges: - rust-lang#127542 ([`macro_metavar_expr_concat`] Add support for literals) - rust-lang#127652 (Unignore cg_gcc fmt) - rust-lang#127664 (Fix precise capturing suggestion for hidden regions when we have APITs) - rust-lang#127806 (Some parser improvements) - rust-lang#127828 (Commonize `uname -m` results for `aarch64` in docker runner) - rust-lang#127845 (unix: break `stack_overflow::install_main_guard` into smaller fn) - rust-lang#127859 (ptr::metadata: avoid references to extern types) - rust-lang#127861 (Document the column numbers for the dbg! macro) - rust-lang#127875 (style-guide: Clarify version-sorting) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 18, 2024
Rollup merge of rust-lang#127828 - tgross35:docker-aarch64-uname, r=onur-ozkan Commonize `uname -m` results for `aarch64` in docker runner `uname -m` on Linux reports `aarch64`, but on MacOS reports `arm64`. Commonize this to `aarch64`. With this fix, it is now possible to run aarch64 CI docker images on Arm MacOS.
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
5 participants
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.
uname -mon Linux reportsaarch64, but on MacOS reportsarm64. Commonize this toaarch64.With this fix, it is now possible to run aarch64 CI docker images on Arm MacOS.