diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f7b30b0df..c4c814e8f4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -164,8 +164,11 @@ jobs: - # Default target: - - aarch64-apple-ios - aarch64-apple-darwin + - aarch64-apple-ios + # - aarch64-apple-tvos Tier 3; handled below + # - aarch64-apple-visionos Tier 3; handled below + # - aarch64-apple-watchos Tier 3; handled below - aarch64-linux-android - aarch64-pc-windows-msvc - aarch64-unknown-linux-gnu @@ -205,6 +208,27 @@ jobs: # TODO: Run in the emulator. cargo_options: --no-run + - target: aarch64-apple-tvos + host_os: macos-14 + rust_channel: nightly + mode: --release + # TODO: Run in the emulator. + cargo_options: --no-run -Z build-std + + - target: aarch64-apple-visionos + host_os: macos-14 + rust_channel: nightly + mode: --release + # TODO: Run in the emulator. + cargo_options: --no-run -Z build-std + + - target: aarch64-apple-watchos + host_os: macos-14 + rust_channel: nightly + mode: --release + # TODO: Run in the emulator. + cargo_options: --no-run -Z build-std + - target: aarch64-linux-android host_os: ubuntu-22.04 # TODO: https://github.com/briansmith/ring/issues/486 diff --git a/mk/install-build-tools.sh b/mk/install-build-tools.sh index 81fd9ed1ba..ea07d6eebd 100755 --- a/mk/install-build-tools.sh +++ b/mk/install-build-tools.sh @@ -68,6 +68,9 @@ case ${target-} in esac case ${target-} in +aarch64-apple-tvos|aarch64-apple-visionos|aarch64-apple-watchos)os*) + RING_SKIP_RUSTUP=1 + ;; aarch64-unknown-linux-gnu) # Clang is needed for code coverage. use_clang=1 @@ -212,7 +215,9 @@ linux*) ;; esac -rustup toolchain install --no-self-update --profile=minimal ${toolchain} +if [ -z "${RING_SKIP_RUSTUP-}" ]; then + rustup toolchain install --no-self-update --profile=minimal ${toolchain} +fi if [ -n "${target-}" ]; then rustup target add --toolchain=${toolchain} ${target} fi