Skip to content

Commit c2310b1

Browse files
asomersasomers
committed
Reenable all targets
1 parent bd9f355 commit c2310b1

File tree

1 file changed

+121
-123
lines changed

1 file changed

+121
-123
lines changed

‎.cirrus.yml‎

Lines changed: 121 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -35,36 +35,36 @@ test: &TEST
3535
# same VM. The binary will be built in 32-bit mode, but will execute on a
3636
# 64-bit kernel and in a 64-bit environment. Our tests don't execute any of
3737
# the system's binaries, so the environment shouldn't matter.
38-
#task:
39-
#env:
40-
#TARGET: x86_64-unknown-freebsd
41-
#matrix:
42-
#- name: FreeBSD 12 amd64 & i686
43-
#freebsd_instance:
44-
#image: freebsd-12-4-release-amd64
45-
#- name: FreeBSD 14 amd64 & i686
46-
#freebsd_instance:
47-
#image_family: freebsd-14-0-snap
48-
## Enable tests that would fail on FreeBSD 12
49-
#RUSTFLAGS: --cfg fbsd14 -D warnings
50-
#RUSTDOCFLAGS: --cfg fbsd14
51-
#setup_script:
52-
#- kldload mqueuefs
53-
#- fetch https://sh.rustup.rs -o rustup.sh
54-
#- sh rustup.sh -y --profile=minimal --default-toolchain $MSRV
55-
#- . $HOME/.cargo/env
56-
#- rustup target add i686-unknown-freebsd
57-
#- rustup component add clippy
58-
#<< : *TEST
59-
#i386_test_script:
60-
#- . $HOME/.cargo/env
61-
#- cargo build --target i686-unknown-freebsd
62-
#- cargo doc --no-deps --target i686-unknown-freebsd
63-
#- cargo test --target i686-unknown-freebsd
64-
#i386_feature_script:
65-
#- . $HOME/.cargo/env
66-
#- if [ -z "$NOHACK" ]; then cargo hack check --each-feature --target i686-unknown-freebsd; fi
67-
#before_cache_script: rm -rf $CARGO_HOME/registry/index
38+
task:
39+
env:
40+
TARGET: x86_64-unknown-freebsd
41+
matrix:
42+
- name: FreeBSD 12 amd64 & i686
43+
freebsd_instance:
44+
image: freebsd-12-4-release-amd64
45+
- name: FreeBSD 14 amd64 & i686
46+
freebsd_instance:
47+
image_family: freebsd-14-0-snap
48+
# Enable tests that would fail on FreeBSD 12
49+
RUSTFLAGS: --cfg fbsd14 -D warnings
50+
RUSTDOCFLAGS: --cfg fbsd14
51+
setup_script:
52+
- kldload mqueuefs
53+
- fetch https://sh.rustup.rs -o rustup.sh
54+
- sh rustup.sh -y --profile=minimal --default-toolchain $MSRV
55+
- . $HOME/.cargo/env
56+
- rustup target add i686-unknown-freebsd
57+
- rustup component add clippy
58+
<< : *TEST
59+
i386_test_script:
60+
- . $HOME/.cargo/env
61+
- cargo build --target i686-unknown-freebsd
62+
- cargo doc --no-deps --target i686-unknown-freebsd
63+
- cargo test --target i686-unknown-freebsd
64+
i386_feature_script:
65+
- . $HOME/.cargo/env
66+
- if [ -z "$NOHACK" ]; then cargo hack check --each-feature --target i686-unknown-freebsd; fi
67+
before_cache_script: rm -rf $CARGO_HOME/registry/index
6868

6969
# Test macOS aarch64 in a full VM
7070
task:
@@ -95,30 +95,30 @@ task:
9595
- name: Linux arm gnueabi
9696
env:
9797
TARGET: arm-unknown-linux-gnueabi
98-
#- name: Linux armv7 gnueabihf
99-
#env:
100-
#TARGET: armv7-unknown-linux-gnueabihf
101-
#- name: Linux i686
102-
#env:
103-
#TARGET: i686-unknown-linux-gnu
104-
#- name: Linux i686 musl
105-
#env:
106-
#TARGET: i686-unknown-linux-musl
107-
#- name: Linux MIPS
108-
#env:
109-
#TARGET: mips-unknown-linux-gnu
110-
#- name: Linux MIPS64
111-
#env:
112-
#TARGET: mips64-unknown-linux-gnuabi64
113-
#- name: Linux MIPS64 el
114-
#env:
115-
#TARGET: mips64el-unknown-linux-gnuabi64
116-
#- name: Linux mipsel
117-
#env:
118-
#TARGET: mipsel-unknown-linux-gnu
119-
#- name: Linux powerpc64le
120-
#env:
121-
#TARGET: powerpc64le-unknown-linux-gnu
98+
- name: Linux armv7 gnueabihf
99+
env:
100+
TARGET: armv7-unknown-linux-gnueabihf
101+
- name: Linux i686
102+
env:
103+
TARGET: i686-unknown-linux-gnu
104+
- name: Linux i686 musl
105+
env:
106+
TARGET: i686-unknown-linux-musl
107+
- name: Linux MIPS
108+
env:
109+
TARGET: mips-unknown-linux-gnu
110+
- name: Linux MIPS64
111+
env:
112+
TARGET: mips64-unknown-linux-gnuabi64
113+
- name: Linux MIPS64 el
114+
env:
115+
TARGET: mips64el-unknown-linux-gnuabi64
116+
- name: Linux mipsel
117+
env:
118+
TARGET: mipsel-unknown-linux-gnu
119+
- name: Linux powerpc64le
120+
env:
121+
TARGET: powerpc64le-unknown-linux-gnu
122122
compute_engine_instance:
123123
image_project: cirrus-images
124124
image: family/docker-builder
@@ -137,21 +137,21 @@ task:
137137
# Tasks for Linux native builds
138138
task:
139139
matrix:
140-
#- name: Linux aarch64
141-
#arm_container:
142-
#image: rust:1.63.0
143-
#env:
144-
#TARGET: aarch64-unknown-linux-gnu
140+
- name: Linux aarch64
141+
arm_container:
142+
image: rust:1.63.0
143+
env:
144+
TARGET: aarch64-unknown-linux-gnu
145145
- name: Linux x86_64
146146
container:
147147
image: rust:1.63.0
148148
env:
149149
TARGET: x86_64-unknown-linux-gnu
150-
#- name: Linux x86_64 musl
151-
#container:
152-
#image: rust:1.63.0
153-
#env:
154-
#TARGET: x86_64-unknown-linux-musl
150+
- name: Linux x86_64 musl
151+
container:
152+
image: rust:1.63.0
153+
env:
154+
TARGET: x86_64-unknown-linux-musl
155155
setup_script:
156156
- rustup target add $TARGET
157157
- rustup component add clippy
@@ -166,8 +166,6 @@ task:
166166
TARGET: x86_64-unknown-linux-gnu
167167
setup_script:
168168
- rustup component add clippy
169-
- rustup toolchain list
170-
- rustc --version
171169
<< : *TEST
172170
before_cache_script: rm -rf $CARGO_HOME/registry/index
173171

@@ -179,63 +177,63 @@ task:
179177
BUILD: check
180178
HOST: x86_64-unknown-linux-gnu
181179
matrix:
182-
## Cross claims to support Android, but when it tries to run Nix's tests it
183-
## reports undefined symbol references.
184-
#- name: Android aarch64
185-
#env:
186-
#TARGET: aarch64-linux-android
187-
#- name: Android arm
188-
#env:
189-
#TARGET: arm-linux-androideabi
190-
#- name: Android armv7
191-
#env:
192-
#TARGET: armv7-linux-androideabi
193-
#- name: Android i686
194-
#env:
195-
#TARGET: i686-linux-android
196-
#- name: Android x86_64
197-
#env:
198-
#TARGET: x86_64-linux-android
199-
#- name: Linux arm-musleabi
200-
#env:
201-
#TARGET: arm-unknown-linux-musleabi
202-
#- name: Fuchsia x86_64
203-
#env:
204-
#TARGET: x86_64-fuchsia
205-
#- name: Illumos
206-
#env:
207-
#TARGET: x86_64-unknown-illumos
208-
## Cross claims to support running tests on iOS, but it actually doesn't.
209-
## https://github.com/rust-embedded/cross/issues/535
210-
#- name: iOS aarch64
211-
#env:
212-
## cargo hack tries to invoke the iphonesimulator SDK for iOS
213-
#NOHACK: 1
214-
#TARGET: aarch64-apple-ios
215-
#- name: iOS x86_64
216-
#env:
217-
## cargo hack tries to invoke the iphonesimulator SDK for iOS
218-
#NOHACK: 1
219-
#TARGET: x86_64-apple-ios
220-
## Cross testing on powerpc fails with "undefined reference to renameat2".
221-
## Perhaps cross is using too-old a version?
222-
#- name: Linux powerpc
223-
#env:
224-
#TARGET: powerpc-unknown-linux-gnu
225-
## Cross claims to support Linux powerpc64, but it really doesn't.
226-
## https://github.com/rust-embedded/cross/issues/441
227-
#- name: Linux powerpc64
228-
#env:
229-
#TARGET: powerpc64-unknown-linux-gnu
230-
#- name: Linux s390x
231-
#env:
232-
#TARGET: s390x-unknown-linux-gnu
233-
#- name: Linux x32
234-
#env:
235-
#TARGET: x86_64-unknown-linux-gnux32
236-
#- name: macOS x86_64
237-
#env:
238-
#TARGET: x86_64-apple-darwin
180+
# Cross claims to support Android, but when it tries to run Nix's tests it
181+
# reports undefined symbol references.
182+
- name: Android aarch64
183+
env:
184+
TARGET: aarch64-linux-android
185+
- name: Android arm
186+
env:
187+
TARGET: arm-linux-androideabi
188+
- name: Android armv7
189+
env:
190+
TARGET: armv7-linux-androideabi
191+
- name: Android i686
192+
env:
193+
TARGET: i686-linux-android
194+
- name: Android x86_64
195+
env:
196+
TARGET: x86_64-linux-android
197+
- name: Linux arm-musleabi
198+
env:
199+
TARGET: arm-unknown-linux-musleabi
200+
- name: Fuchsia x86_64
201+
env:
202+
TARGET: x86_64-fuchsia
203+
- name: Illumos
204+
env:
205+
TARGET: x86_64-unknown-illumos
206+
# Cross claims to support running tests on iOS, but it actually doesn't.
207+
# https://github.com/rust-embedded/cross/issues/535
208+
- name: iOS aarch64
209+
env:
210+
# cargo hack tries to invoke the iphonesimulator SDK for iOS
211+
NOHACK: 1
212+
TARGET: aarch64-apple-ios
213+
- name: iOS x86_64
214+
env:
215+
# cargo hack tries to invoke the iphonesimulator SDK for iOS
216+
NOHACK: 1
217+
TARGET: x86_64-apple-ios
218+
# Cross testing on powerpc fails with "undefined reference to renameat2".
219+
# Perhaps cross is using too-old a version?
220+
- name: Linux powerpc
221+
env:
222+
TARGET: powerpc-unknown-linux-gnu
223+
# Cross claims to support Linux powerpc64, but it really doesn't.
224+
# https://github.com/rust-embedded/cross/issues/441
225+
- name: Linux powerpc64
226+
env:
227+
TARGET: powerpc64-unknown-linux-gnu
228+
- name: Linux s390x
229+
env:
230+
TARGET: s390x-unknown-linux-gnu
231+
- name: Linux x32
232+
env:
233+
TARGET: x86_64-unknown-linux-gnux32
234+
- name: macOS x86_64
235+
env:
236+
TARGET: x86_64-apple-darwin
239237
- name: NetBSD x86_64
240238
env:
241239
TARGET: x86_64-unknown-netbsd

0 commit comments

Comments
 (0)