From 136d7b365ecbb89ca731b9f6a82d36e92c5a5d78 Mon Sep 17 00:00:00 2001 From: Adam Curtis Date: Fri, 16 Jun 2023 14:29:41 -0400 Subject: [PATCH 1/3] add ARM64 Windows to release builds --- install.ps1 | 10 ++++++++-- xtask/config.yaml | 2 ++ xtask/gha-matrices/release-builds.json | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/install.ps1 b/install.ps1 index 34dbd83c..0eecc14f 100644 --- a/install.ps1 +++ b/install.ps1 @@ -44,8 +44,14 @@ Param( ### Detection ############################################################ -# TODO: we only support x86_64 platform right now -$platform ="x86_64" +# TODO: we only support 64-bit x86 and ARM +if ($env:PROCESSOR_ARCHITECTURE -eq "AMD64") { + $platform ="x86_64" +} elseif ($env:PROCESSOR_ARCHITECTURE -eq "ARM64") { + $platform = "aarch64" +} else { + throw "Unsupported architecture: ${env:PROCESSOR_ARCHITECTURE}" +} ### Prerequisites ############################################################ diff --git a/xtask/config.yaml b/xtask/config.yaml index 8da9efb9..6abcf2c8 100644 --- a/xtask/config.yaml +++ b/xtask/config.yaml @@ -8,6 +8,8 @@ release-builds: - { runner: macos-latest , target: x86_64-apple-darwin } - { runner: macos-latest , target: aarch64-apple-darwin } - { runner: windows-latest , target: x86_64-pc-windows-msvc } + - { runner: windows-latest , target: aarch64-pc-windows-msvc } + release-tests: - os: alpine type: docker diff --git a/xtask/gha-matrices/release-builds.json b/xtask/gha-matrices/release-builds.json index 9cf91e9d..d65b6ca8 100644 --- a/xtask/gha-matrices/release-builds.json +++ b/xtask/gha-matrices/release-builds.json @@ -1 +1 @@ -{"include":[{"target":"x86_64-unknown-linux-musl","runner":"ubuntu-latest"},{"target":"arm-unknown-linux-musleabihf","runner":"ubuntu-latest"},{"target":"armv7-unknown-linux-musleabihf","runner":"ubuntu-latest"},{"target":"aarch64-unknown-linux-musl","runner":"ubuntu-latest"},{"target":"aarch64-unknown-linux-gnu","runner":"ubuntu-latest"},{"target":"x86_64-apple-darwin","runner":"macos-latest"},{"target":"aarch64-apple-darwin","runner":"macos-latest"},{"target":"x86_64-pc-windows-msvc","runner":"windows-latest"}]} \ No newline at end of file +{"include":[{"target":"x86_64-unknown-linux-musl","runner":"ubuntu-latest"},{"target":"arm-unknown-linux-musleabihf","runner":"ubuntu-latest"},{"target":"armv7-unknown-linux-musleabihf","runner":"ubuntu-latest"},{"target":"aarch64-unknown-linux-musl","runner":"ubuntu-latest"},{"target":"aarch64-unknown-linux-gnu","runner":"ubuntu-latest"},{"target":"x86_64-apple-darwin","runner":"macos-latest"},{"target":"aarch64-apple-darwin","runner":"macos-latest"},{"target":"x86_64-pc-windows-msvc","runner":"windows-latest"},{"target":"aarch64-pc-windows-msvc","runner":"windows-latest"}]} \ No newline at end of file From f0d155d2fb1eb52db6045b778b687ecc196ab8d7 Mon Sep 17 00:00:00 2001 From: Adam Curtis Date: Fri, 16 Jun 2023 14:52:05 -0400 Subject: [PATCH 2/3] add armv7 windows --- xtask/config.yaml | 1 + xtask/gha-matrices/release-builds.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/xtask/config.yaml b/xtask/config.yaml index 6abcf2c8..37f6fe7a 100644 --- a/xtask/config.yaml +++ b/xtask/config.yaml @@ -8,6 +8,7 @@ release-builds: - { runner: macos-latest , target: x86_64-apple-darwin } - { runner: macos-latest , target: aarch64-apple-darwin } - { runner: windows-latest , target: x86_64-pc-windows-msvc } + - { runner: windows-latest , target: armv7-pc-windows-msvc } - { runner: windows-latest , target: aarch64-pc-windows-msvc } release-tests: diff --git a/xtask/gha-matrices/release-builds.json b/xtask/gha-matrices/release-builds.json index d65b6ca8..5f1f2db9 100644 --- a/xtask/gha-matrices/release-builds.json +++ b/xtask/gha-matrices/release-builds.json @@ -1 +1 @@ -{"include":[{"target":"x86_64-unknown-linux-musl","runner":"ubuntu-latest"},{"target":"arm-unknown-linux-musleabihf","runner":"ubuntu-latest"},{"target":"armv7-unknown-linux-musleabihf","runner":"ubuntu-latest"},{"target":"aarch64-unknown-linux-musl","runner":"ubuntu-latest"},{"target":"aarch64-unknown-linux-gnu","runner":"ubuntu-latest"},{"target":"x86_64-apple-darwin","runner":"macos-latest"},{"target":"aarch64-apple-darwin","runner":"macos-latest"},{"target":"x86_64-pc-windows-msvc","runner":"windows-latest"},{"target":"aarch64-pc-windows-msvc","runner":"windows-latest"}]} \ No newline at end of file +{"include":[{"target":"x86_64-unknown-linux-musl","runner":"ubuntu-latest"},{"target":"arm-unknown-linux-musleabihf","runner":"ubuntu-latest"},{"target":"armv7-unknown-linux-musleabihf","runner":"ubuntu-latest"},{"target":"aarch64-unknown-linux-musl","runner":"ubuntu-latest"},{"target":"aarch64-unknown-linux-gnu","runner":"ubuntu-latest"},{"target":"x86_64-apple-darwin","runner":"macos-latest"},{"target":"aarch64-apple-darwin","runner":"macos-latest"},{"target":"x86_64-pc-windows-msvc","runner":"windows-latest"},{"target":"armv7-pc-windows-msvc","runner":"windows-latest"},{"target":"aarch64-pc-windows-msvc","runner":"windows-latest"}]} \ No newline at end of file From 4e0c3beb1ade992072ccfbf4cf2b610e2be6ac1a Mon Sep 17 00:00:00 2001 From: Adam Curtis Date: Fri, 16 Jun 2023 15:14:14 -0400 Subject: [PATCH 3/3] remove windows arm32 (not supported by rustup) --- xtask/config.yaml | 1 - xtask/gha-matrices/release-builds.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/xtask/config.yaml b/xtask/config.yaml index 37f6fe7a..6abcf2c8 100644 --- a/xtask/config.yaml +++ b/xtask/config.yaml @@ -8,7 +8,6 @@ release-builds: - { runner: macos-latest , target: x86_64-apple-darwin } - { runner: macos-latest , target: aarch64-apple-darwin } - { runner: windows-latest , target: x86_64-pc-windows-msvc } - - { runner: windows-latest , target: armv7-pc-windows-msvc } - { runner: windows-latest , target: aarch64-pc-windows-msvc } release-tests: diff --git a/xtask/gha-matrices/release-builds.json b/xtask/gha-matrices/release-builds.json index 5f1f2db9..d65b6ca8 100644 --- a/xtask/gha-matrices/release-builds.json +++ b/xtask/gha-matrices/release-builds.json @@ -1 +1 @@ -{"include":[{"target":"x86_64-unknown-linux-musl","runner":"ubuntu-latest"},{"target":"arm-unknown-linux-musleabihf","runner":"ubuntu-latest"},{"target":"armv7-unknown-linux-musleabihf","runner":"ubuntu-latest"},{"target":"aarch64-unknown-linux-musl","runner":"ubuntu-latest"},{"target":"aarch64-unknown-linux-gnu","runner":"ubuntu-latest"},{"target":"x86_64-apple-darwin","runner":"macos-latest"},{"target":"aarch64-apple-darwin","runner":"macos-latest"},{"target":"x86_64-pc-windows-msvc","runner":"windows-latest"},{"target":"armv7-pc-windows-msvc","runner":"windows-latest"},{"target":"aarch64-pc-windows-msvc","runner":"windows-latest"}]} \ No newline at end of file +{"include":[{"target":"x86_64-unknown-linux-musl","runner":"ubuntu-latest"},{"target":"arm-unknown-linux-musleabihf","runner":"ubuntu-latest"},{"target":"armv7-unknown-linux-musleabihf","runner":"ubuntu-latest"},{"target":"aarch64-unknown-linux-musl","runner":"ubuntu-latest"},{"target":"aarch64-unknown-linux-gnu","runner":"ubuntu-latest"},{"target":"x86_64-apple-darwin","runner":"macos-latest"},{"target":"aarch64-apple-darwin","runner":"macos-latest"},{"target":"x86_64-pc-windows-msvc","runner":"windows-latest"},{"target":"aarch64-pc-windows-msvc","runner":"windows-latest"}]} \ No newline at end of file