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

Add Windows Arm64 to Other Installation Methods #3854

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ jobs:
- release
target:
- x86_64-pc-windows-msvc
- aarch64-pc-windows-msvc
- x86_64-pc-windows-gnu
include:
- target: x86_64-pc-windows-msvc
Expand Down Expand Up @@ -173,7 +174,7 @@ jobs:
- release
target:
- x86_64-pc-windows-msvc
- aarch64-pc-windows-msvc # skip-pr
- aarch64-pc-windows-msvc
- x86_64-pc-windows-gnu
include:
- target: x86_64-pc-windows-msvc
Expand Down Expand Up @@ -316,7 +317,7 @@ jobs:
target:
- x86_64-pc-windows-msvc
- i686-pc-windows-msvc # skip-pr skip-master
- aarch64-pc-windows-msvc # skip-pr
- aarch64-pc-windows-msvc
- x86_64-pc-windows-gnu
- i686-pc-windows-gnu # skip-pr skip-master
include:
Expand Down
2 changes: 1 addition & 1 deletion ci/actions-templates/windows-builds-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs: # skip-master skip-pr skip-stable
target:
- x86_64-pc-windows-msvc
- i686-pc-windows-msvc # skip-pr skip-master
- aarch64-pc-windows-msvc # skip-pr
- aarch64-pc-windows-msvc
- x86_64-pc-windows-gnu
- i686-pc-windows-gnu # skip-pr skip-master
include:
Expand Down
4 changes: 4 additions & 0 deletions ci/cloudfront-invalidation.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
rustup/*
rustup/www/*
rustup/stable-release.toml
rustup/dist/aarch64-apple-darwin/rustup-init
rustup/dist/aarch64-apple-darwin/rustup-init.sha256
rustup/dist/aarch64-linux-android/rustup-init
rustup/dist/aarch64-linux-android/rustup-init.sha256
rustup/dist/aarch64-pc-windows-msvc/rustup-init.exe
rustup/dist/aarch64-pc-windows-msvc/rustup-init.exe.sha256
rustup/dist/aarch64-unknown-linux-gnu/rustup-init
rustup/dist/aarch64-unknown-linux-gnu/rustup-init.sha256
rustup/dist/aarch64-unknown-linux-musl/rustup-init
Expand Down
10 changes: 7 additions & 3 deletions doc/user-guide/src/installation/other.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
The primary installation method, as described at <https://rustup.rs>, differs
by platform:

* On Windows, download and run the [`rustup-init.exe` built for the
`x86_64-pc-windows-msvc` target][setup]. In general, this is the build of
* On Windows, download and run the `rustup-init.exe` built for the
[`x86_64-pc-windows-msvc`] or [`aarch64-pc-windows-msvc`] target,
depending on your OS architecture. In general, this is the build of
`rustup` one should install on Windows. This will require the Visual C++
Build Tools 2019 or equivalent (Visual Studio 2019, etc.) to already be
installed. If you would prefer to install GNU toolchains or the i686
Expand All @@ -15,7 +16,8 @@ by platform:
downloads and runs [`rustup-init.sh`], which in turn downloads and runs the
correct version of the `rustup-init` executable for your platform.

[setup]: https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe
[`x86_64-pc-windows-msvc`]: https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe
[`aarch64-pc-windows-msvc`]: https://static.rust-lang.org/rustup/dist/aarch64-pc-windows-msvc/rustup-init.exe
[`rustup-init.sh`]: https://static.rust-lang.org/rustup/rustup-init.sh

`rustup-init` accepts arguments, which can be passed through the shell script.
Expand Down Expand Up @@ -74,6 +76,8 @@ You can manually download `rustup-init` for a given target from
- [sha256 file](https://static.rust-lang.org/rustup/dist/aarch64-apple-darwin/rustup-init.sha256)
- [aarch64-linux-android](https://static.rust-lang.org/rustup/dist/aarch64-linux-android/rustup-init)
- [sha256 file](https://static.rust-lang.org/rustup/dist/aarch64-linux-android/rustup-init.sha256)
- [aarch64-pc-windows-msvc](https://static.rust-lang.org/rustup/dist/aarch64-pc-windows-msvc/rustup-init.exe)
- [sha256 file](https://static.rust-lang.org/rustup/dist/aarch64-pc-windows-msvc/rustup-init.exe.sha256)
- [aarch64-unknown-linux-gnu](https://static.rust-lang.org/rustup/dist/aarch64-unknown-linux-gnu/rustup-init)
- [sha256 file](https://static.rust-lang.org/rustup/dist/aarch64-unknown-linux-gnu/rustup-init.sha256)
- [aarch64-unknown-linux-musl](https://static.rust-lang.org/rustup/dist/aarch64-unknown-linux-musl/rustup-init)
Expand Down
Loading