Skip to content

Switch azure to macOS 10.15.#7906

Merged
bors merged 2 commits into
rust-lang:masterfrom
ehuss:macos-10.15
Feb 20, 2020
Merged

Switch azure to macOS 10.15.#7906
bors merged 2 commits into
rust-lang:masterfrom
ehuss:macos-10.15

Conversation

@ehuss

@ehuss ehuss commented Feb 19, 2020

Copy link
Copy Markdown
Contributor

Switches CI to the macOS 10.15 image. Since 32-bit support is no longer available, this changes how cross-compile testing works. I decided to use x86_64-apple-ios as a cross target, since it can easily build/link on macOS. cargo run won't work without a simulator, so some of the tests are restructured to check if cargo run is allowed. If you do have a simulator, it should Just Work. CI doesn't seem to be configured with a simulator installed, and I didn't bother to look if that would be possible (the simulators tend to be several gigabytes in size).

An alternative approach would be to use wasm as a cross target, which is also fairly easy to support. But wasm is a sufficiently different target that it can cause some issues in some tests, and is a bit harder to run as an executable.

This also adds some more help text on how to configure cross-compile tests.

Rustup is now installed on macOS by default, so no need to install it. Unfortunately self-updates are not allowed, but hopefully that won't be an issue.

Closes #7821

@rust-highfive

Copy link
Copy Markdown

r? @alexcrichton

(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 Feb 19, 2020
@ehuss

ehuss commented Feb 19, 2020

Copy link
Copy Markdown
Contributor Author

Opening this to do some testing with rust-lang's builders, which I believe are different hardware from the free microsoft hosted agents?

@alexcrichton

Copy link
Copy Markdown
Member

In theory the hardware is the same but I wouldn't put it past there being some differences. Other than that the changes to the test suite look good to me, so r=me when you've got the copy thing done.

@ehuss ehuss changed the title [WIP] Switch azure to macOS 10.15. Switch azure to macOS 10.15. Feb 20, 2020
@ehuss

ehuss commented Feb 20, 2020

Copy link
Copy Markdown
Contributor Author

@alexcrichton I think this is ready to go. Do you want to take a quick peek at the last commit? I ran tests for a couple hours locally without problems, and have done a number of builds on azure without problems.

@Mark-Simulacrum

Copy link
Copy Markdown
Member

This looks good to me, though I'm not sure about opting to only do this on the environment variable being set. I do think it's true that no one is going to hit this in practice, hopefully, and the environment variable gives us a way to "easily" debug if someone does hit this.

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+

Alas, such is life where we accumulate lots of workarounds!

@bors

bors commented Feb 20, 2020

Copy link
Copy Markdown
Contributor

📌 Commit 457c4bc has been approved by alexcrichton

@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 Feb 20, 2020
@bors

bors commented Feb 20, 2020

Copy link
Copy Markdown
Contributor

⌛ Testing commit 457c4bc with merge 369991b...

@bors

bors commented Feb 20, 2020

Copy link
Copy Markdown
Contributor

☀️ Test successful - checks-azure
Approved by: alexcrichton
Pushing 369991b to master...

@bors bors merged commit 369991b into rust-lang:master Feb 20, 2020
bors added a commit to rust-lang/rust that referenced this pull request Feb 22, 2020
Update cargo

11 commits in e02974078a692d7484f510eaec0e88d1b6cc0203..e57bd02999c9f40d52116e0beca7d1dccb0643de
2020-02-18 15:24:43 +0000 to 2020-02-21 20:20:10 +0000
- fix most remaining clippy findings (mostly redundant imports) (rust-lang/cargo#7912)
- Add -Zfeatures tracking issues. (rust-lang/cargo#7917)
- Use rust-lang/rust linkchecker on CI. (rust-lang/cargo#7913)
- Clean up code mostly based on clippy suggestions (rust-lang/cargo#7911)
- Add an option to include crate versions to the generated docs (rust-lang/cargo#7903)
- Better support for license-file. (rust-lang/cargo#7905)
- Add new feature resolver. (rust-lang/cargo#7820)
- Switch azure to macOS 10.15. (rust-lang/cargo#7906)
- Modified the help information of cargo-rustc (rust-lang/cargo#7892)
- Update for nightly rustfmt. (rust-lang/cargo#7904)
- Support `--config path_to_config.toml` cli syntax. (rust-lang/cargo#7901)
ehuss pushed a commit to ehuss/cargo that referenced this pull request Mar 16, 2020
Switch azure to macOS 10.15.

Switches CI to the macOS 10.15 image.  Since 32-bit support is no longer available, this changes how cross-compile testing works.  I decided to use `x86_64-apple-ios` as a cross target, since it can easily build/link on macOS.  `cargo run` won't work without a simulator, so some of the tests are restructured to check if `cargo run` is allowed.  If you do have a simulator, it should Just Work.  CI doesn't seem to be configured with a simulator installed, and I didn't bother to look if that would be possible (the simulators tend to be several gigabytes in size).

An alternative approach would be to use wasm as a cross target, which is also fairly easy to support.  But wasm is a sufficiently different target that it can cause some issues in some tests, and is a bit harder to run as an executable.

This also adds some more help text on how to configure cross-compile tests.

Rustup is now installed on macOS by default, so no need to install it.  Unfortunately self-updates are not allowed, but hopefully that won't be an issue.

Closes rust-lang#7821
bors added a commit that referenced this pull request Mar 17, 2020
Bump stable version to 0.43.1

There was a hiccup where 0.43.0 was published to crates.io missing a change (#7848), see #7994 for details. It is not super critical, but in rare cases the bug can cause cargo used as a library to hang.  I think bumping the version and re-publishing is relatively low-effort and low-risk.

This also includes backports to appease CI: #7883 #7906 #7955.
@ehuss ehuss added this to the 1.43.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.

Update CI for upcoming macOS changes

5 participants