diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-12-04 00:37:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-04 00:37:05 +0000 |
| commit | 1fd5fe7163815cc15865ba4cc0c441b0ac4f4eaa (patch) | |
| tree | 5565dc0ccd148b0702cf387804b96ff586f9f4c3 | |
| parent | bedf83bf0b469cc82d10c82a62dd3726655ce3e0 (diff) | |
| parent | c59cd2b846c71c6f366bd88cf50180aebca3c266 (diff) | |
| download | nix-1fd5fe7163815cc15865ba4cc0c441b0ac4f4eaa.zip | |
Merge #1905
1905: Drop x86_64-unknown-darwin to Tier 2 r=rtzoeller a=asomers
And promote aarch64-unknown-darwin to Tier 1. Because that's what Cirrus CI is doing.
Fixes #1904
Co-authored-by: Alan Somers <asomers@gmail.com>
| -rw-r--r-- | .cirrus.yml | 14 | ||||
| -rw-r--r-- | README.md | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index ab1178dd..1e073d70 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -67,13 +67,13 @@ task: - if [ -z "$NOHACK" ]; then cargo hack check --each-feature --target i686-unknown-freebsd; fi before_cache_script: rm -rf $CARGO_HOME/registry/index -# Test macOS x86_64 in a full VM +# Test macOS aarch64 in a full VM task: - name: macOS x86_64 + name: macOS aarch64 env: - TARGET: x86_64-apple-darwin - osx_instance: - image: big-sur-xcode + TARGET: aarch64-apple-darwin + macos_instance: + image: ghcr.io/cirruslabs/macos-ventura-base:latest setup_script: - curl --proto '=https' --tlsv1.2 -sSf -o rustup.sh https://sh.rustup.rs - sh rustup.sh -y --profile=minimal --default-toolchain $TOOLCHAIN @@ -235,9 +235,9 @@ task: - name: Linux x32 env: TARGET: x86_64-unknown-linux-gnux32 - - name: macOS aarch64 + - name: macOS x86_64 env: - TARGET: aarch64-apple-darwin + TARGET: x86_64-apple-darwin - name: NetBSD x86_64 env: TARGET: x86_64-unknown-netbsd @@ -47,6 +47,7 @@ limitations. Support for platforms is split into three tiers: The following targets are supported by `nix`: Tier 1: + * aarch64-apple-darwin * aarch64-unknown-linux-gnu * arm-unknown-linux-gnueabi * armv7-unknown-linux-gnueabihf @@ -58,13 +59,11 @@ Tier 1: * mips64el-unknown-linux-gnuabi64 * mipsel-unknown-linux-gnu * powerpc64le-unknown-linux-gnu - * x86_64-apple-darwin * x86_64-unknown-freebsd * x86_64-unknown-linux-gnu * x86_64-unknown-linux-musl Tier 2: - * aarch64-apple-darwin * aarch64-apple-ios * aarch64-linux-android * arm-linux-androideabi @@ -75,6 +74,7 @@ Tier 2: * s390x-unknown-linux-gnu * x86_64-apple-ios * x86_64-linux-android + * x86_64-apple-darwin * x86_64-unknown-illumos * x86_64-unknown-netbsd |