From f0e0e0996891b710b64543143aa735ea3cacec24 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Wed, 20 Nov 2024 04:05:49 +0900 Subject: [PATCH] Update comments --- main.sh | 18 +++++++++--------- tools/codegen/src/lib.rs | 14 +++++++------- tools/codegen/src/main.rs | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/main.sh b/main.sh index 2bec4633..0d0067fa 100755 --- a/main.sh +++ b/main.sh @@ -252,8 +252,8 @@ read_manifest() { fi ;; macos | windows) - # Binaries compiled for x86_64 macOS will usually also work on aarch64 macOS. - # Binaries compiled for x86_64 Windows will usually also work on aarch64 Windows 11+. + # Binaries compiled for x86_64 macOS will usually also work on AArch64 macOS. + # Binaries compiled for x86_64 Windows will usually also work on AArch64 Windows 11+. host_platform="${host_arch}_${host_os}" download_info=$(call_jq <<<"${manifest}" -r ".${host_platform}") if [[ "${download_info}" == "null" ]] && [[ "${host_arch}" != "x86_64" ]]; then @@ -499,19 +499,19 @@ esac case "$(uname -m)" in aarch64 | arm64) host_arch="aarch64" ;; xscale | arm | armv*l) - # Ignore arm for now, as we need to consider the version and whether hard-float is supported. + # Ignore Arm for now, as we need to consider the version and whether hard-float is supported. # https://github.com/rust-lang/rustup/pull/593 # https://github.com/cross-rs/cross/pull/1018 # Does it seem only armv7l+ is supported? - # https://github.com/actions/runner/blob/v2.315.0/src/Misc/externals.sh#L189 + # https://github.com/actions/runner/blob/v2.321.0/src/Misc/externals.sh#L178 # https://github.com/actions/runner/issues/688 - bail "32-bit ARM runner is not supported yet by this action; if you need support for this platform, please submit an issue at " + bail "32-bit Arm runner is not supported yet by this action; if you need support for this platform, please submit an issue at " ;; - # GitHub Actions Runner supports Linux (x86_64, aarch64, arm), Windows (x86_64, aarch64), - # and macOS (x86_64, aarch64). - # https://github.com/actions/runner/blob/v2.315.0/.github/workflows/build.yml#L21 + # GitHub Actions Runner supports Linux (x86_64, AArch64, Arm), Windows (x86_64, AArch64), + # and macOS (x86_64, AArch64). + # https://github.com/actions/runner/blob/v2.321.0/.github/workflows/build.yml#L21 # https://docs.github.com/en/actions/hosting-your-own-runners/about-self-hosted-runners#supported-architectures-and-operating-systems-for-self-hosted-runners - # So we can assume x86_64 unless it is aarch64 or arm. + # So we can assume x86_64 unless it is AArch64 or Arm. *) host_arch="x86_64" ;; esac info "host platform: ${host_arch}_${host_os}" diff --git a/tools/codegen/src/lib.rs b/tools/codegen/src/lib.rs index 2ec5ece2..173c7d60 100644 --- a/tools/codegen/src/lib.rs +++ b/tools/codegen/src/lib.rs @@ -311,22 +311,22 @@ impl StringOrArray { } } -/// GitHub Actions Runner supports Linux (x86_64, aarch64, arm), Windows (x86_64, aarch64), -/// and macOS (x86_64, aarch64). -/// https://github.com/actions/runner/blob/v2.315.0/.github/workflows/build.yml#L21 +/// GitHub Actions Runner supports Linux (x86_64, AArch64, Arm), Windows (x86_64, AArch64), +/// and macOS (x86_64, AArch64). +/// https://github.com/actions/runner/blob/v2.321.0/.github/workflows/build.yml#L21 /// https://docs.github.com/en/actions/hosting-your-own-runners/about-self-hosted-runners#supported-architectures-and-operating-systems-for-self-hosted-runners /// /// Note: /// - Static-linked binaries compiled for linux-musl will also work on linux-gnu systems and are /// usually preferred over linux-gnu binaries because they can avoid glibc version issues. /// (rustc enables statically linking for linux-musl by default, except for mips.) -/// - Binaries compiled for x86_64 macOS will usually also work on aarch64 macOS. -/// - Binaries compiled for x86_64 Windows will usually also work on aarch64 Windows 11+. -/// - Ignore arm for now, as we need to consider the version and whether hard-float is supported. +/// - Binaries compiled for x86_64 macOS will usually also work on AArch64 macOS. +/// - Binaries compiled for x86_64 Windows will usually also work on AArch64 Windows 11+. +/// - Ignore Arm for now, as we need to consider the version and whether hard-float is supported. /// https://github.com/rust-lang/rustup/pull/593 /// https://github.com/cross-rs/cross/pull/1018 /// Does it seem only armv7l+ is supported? -/// https://github.com/actions/runner/blob/v2.315.0/src/Misc/externals.sh#L189 +/// https://github.com/actions/runner/blob/v2.321.0/src/Misc/externals.sh#L178 /// https://github.com/actions/runner/issues/688 // TODO: support musl with dynamic linking like wasmtime 22.0.0+'s musl binaries: https://github.com/bytecodealliance/wasmtime/releases/tag/v22.0.0 #[allow(non_camel_case_types)] diff --git a/tools/codegen/src/main.rs b/tools/codegen/src/main.rs index 8dbf384d..7502f1d8 100644 --- a/tools/codegen/src/main.rs +++ b/tools/codegen/src/main.rs @@ -441,7 +441,7 @@ fn main() -> Result<()> { && download_info[&HostPlatform::x86_64_macos].url == download_info[&HostPlatform::aarch64_macos].url { - // macOS universal binary or x86_64 binary that works on both x86_64 and aarch64 (rosetta). + // macOS universal binary or x86_64 binary that works on both x86_64 and AArch64 (rosetta). download_info.remove(&HostPlatform::aarch64_macos); } has_build_metadata |= !semver_version.build.is_empty();