Skip to content

Commit d6cd3c6

Browse files
authored
Merge pull request #4068 from tgross35/ci-remove-old-versions
ci: Remove the logic to handle old rust versions
2 parents 23a831c + cf711f2 commit d6cd3c6

File tree

1 file changed

+12
-29
lines changed

1 file changed

+12
-29
lines changed

ci/build.sh

+12-29
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,17 @@ test_target() {
110110
rust_linux_targets="\
111111
aarch64-linux-android \
112112
aarch64-unknown-linux-gnu \
113+
aarch64-unknown-linux-musl \
113114
arm-linux-androideabi \
114115
arm-unknown-linux-gnueabi \
115116
arm-unknown-linux-gnueabihf \
117+
arm-unknown-linux-musleabi \
118+
arm-unknown-linux-musleabihf \
116119
armv7-linux-androideabi \
117120
armv7-unknown-linux-gnueabihf \
121+
armv7-unknown-linux-musleabihf \
118122
i586-unknown-linux-gnu \
123+
i586-unknown-linux-musl \
119124
i686-linux-android \
120125
i686-unknown-freebsd \
121126
i686-unknown-linux-gnu \
@@ -124,50 +129,38 @@ powerpc-unknown-linux-gnu \
124129
powerpc64-unknown-linux-gnu \
125130
powerpc64le-unknown-linux-gnu \
126131
s390x-unknown-linux-gnu \
132+
sparc64-unknown-linux-gnu \
133+
sparcv9-sun-solaris \
134+
wasm32-unknown-emscripten \
135+
wasm32-unknown-unknown \
136+
x86_64-linux-android \
127137
x86_64-unknown-freebsd \
128138
x86_64-unknown-linux-gnu \
129139
x86_64-unknown-linux-musl \
130140
x86_64-unknown-netbsd \
131141
"
132142

133-
rust_gt_1_13_linux_targets="\
134-
arm-unknown-linux-musleabi \
135-
arm-unknown-linux-musleabihf \
136-
armv7-unknown-linux-musleabihf \
137-
sparc64-unknown-linux-gnu \
138-
wasm32-unknown-emscripten \
139-
x86_64-linux-android \
140-
"
141-
rust_gt_1_19_linux_targets="\
142-
aarch64-unknown-linux-musl \
143-
sparcv9-sun-solaris \
144-
wasm32-unknown-unknown \
145-
"
146-
rust_gt_1_24_linux_targets="\
147-
i586-unknown-linux-musl \
148-
"
149-
150143
rust_nightly_linux_targets="\
151144
aarch64-unknown-fuchsia \
152145
armv5te-unknown-linux-gnueabi \
153146
armv5te-unknown-linux-musleabi \
154147
i686-pc-windows-gnu \
155148
riscv64gc-unknown-linux-gnu \
156149
x86_64-fortanix-unknown-sgx \
157-
x86_64-unknown-fuchsia \
158150
x86_64-pc-solaris \
159151
x86_64-pc-windows-gnu \
152+
x86_64-unknown-fuchsia \
160153
x86_64-unknown-illumos \
161154
x86_64-unknown-linux-gnux32 \
162155
x86_64-unknown-redox \
163156
"
164157

165158
rust_apple_targets="\
159+
aarch64-apple-darwin \
166160
aarch64-apple-ios \
167161
"
168162

169163
rust_nightly_apple_targets="\
170-
aarch64-apple-darwin \
171164
"
172165

173166
# Must start with `x86_64-pc-windows-msvc` first.
@@ -183,16 +176,6 @@ case "${OS}" in
183176
linux*)
184177
targets="$rust_linux_targets"
185178

186-
if [ "$rust" != "1.13.0" ]; then
187-
targets="$targets $rust_gt_1_13_linux_targets"
188-
if [ "$rust" != "1.19.0" ]; then
189-
targets="$targets $rust_gt_1_19_linux_targets"
190-
if [ "${rust}" != "1.24.0" ]; then
191-
targets="$targets $rust_gt_1_24_linux_targets"
192-
fi
193-
fi
194-
fi
195-
196179
if [ "$rust" = "nightly" ]; then
197180
targets="$targets $rust_nightly_linux_targets"
198181
fi

0 commit comments

Comments
 (0)