From 7abbc70e516cd3a4d5e459c733f7e775a82aef13 Mon Sep 17 00:00:00 2001 From: Alovchin91 <8490695+Alovchin91@users.noreply.github.com> Date: Wed, 29 May 2024 00:41:52 +0200 Subject: [PATCH 1/3] Update Other installation methods page to include aarch64-pc-windows-msvc --- doc/user-guide/src/installation/other.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/user-guide/src/installation/other.md b/doc/user-guide/src/installation/other.md index 7b6dee2ba5..dce210f376 100644 --- a/doc/user-guide/src/installation/other.md +++ b/doc/user-guide/src/installation/other.md @@ -3,8 +3,9 @@ The primary installation method, as described at , 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 @@ -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. @@ -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) From d9cec0992ccaa4c555c6d7663a1d4545c18fd3f3 Mon Sep 17 00:00:00 2001 From: Alovchin91 <8490695+Alovchin91@users.noreply.github.com> Date: Wed, 29 May 2024 00:41:52 +0200 Subject: [PATCH 2/3] Add aarch64-apple-darwin and aarch64-pc-windows-msvc to cloudfront-invalidation.txt --- ci/cloudfront-invalidation.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci/cloudfront-invalidation.txt b/ci/cloudfront-invalidation.txt index 901321807a..c37f5056a0 100644 --- a/ci/cloudfront-invalidation.txt +++ b/ci/cloudfront-invalidation.txt @@ -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 From 4f696b8024f4fdabaee64327a50554f58e02bb89 Mon Sep 17 00:00:00 2001 From: Alovchin91 <8490695+Alovchin91@users.noreply.github.com> Date: Wed, 29 May 2024 00:46:29 +0200 Subject: [PATCH 3/3] Enable building Rustup win-aarch64 on PR --- .github/workflows/ci.yaml | 5 +++-- ci/actions-templates/windows-builds-template.yaml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 588c48f46c..ef645a1b26 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -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 @@ -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 @@ -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: diff --git a/ci/actions-templates/windows-builds-template.yaml b/ci/actions-templates/windows-builds-template.yaml index 08ba2e34d8..e931a1d8b3 100644 --- a/ci/actions-templates/windows-builds-template.yaml +++ b/ci/actions-templates/windows-builds-template.yaml @@ -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: