Skip to content

Commit 8c89a72

Browse files
committed
Enable more cross tests
1 parent 38c7ba0 commit 8c89a72

File tree

1 file changed

+10
-24
lines changed

1 file changed

+10
-24
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -171,36 +171,19 @@ jobs:
171171
runs-on: ubuntu-latest
172172
strategy:
173173
fail-fast: false
174-
# TODO: Sadly, we cant configure target-feature in a meaningful way
175-
# because `cross` doesn't tell qemu to enable any non-default cpu
176-
# features, nor does it give us a way to do so.
177-
#
178-
# Ultimately, we'd like to do something like [rust-lang/stdarch][stdarch].
179-
# This is a lot more complex... but in practice it's likely that we can just
180-
# snarf the docker config from around [here][1000-dockerfiles].
181-
#
182-
# [stdarch]: https://github.com/rust-lang/stdarch/blob/a5db4eaf/.github/workflows/main.yml#L67
183-
# [1000-dockerfiles]: https://github.com/rust-lang/stdarch/tree/a5db4eaf/ci/docker
184174

185175
matrix:
186176
target:
187-
- i586-unknown-linux-gnu
188-
# 32-bit arm has a few idiosyncracies like having subnormal flushing
189-
# to zero on by default. Ideally we'd set
190177
- armv7-unknown-linux-gnueabihf
191178
- aarch64-unknown-linux-gnu
192-
# Note: The issue above means neither of these mips targets will use
193-
# MSA (mips simd) but MIPS uses a nonstandard binary representation
194-
# for NaNs which makes it worth testing on despite that.
179+
- powerpc-unknown-linux-gnu
180+
- powerpc64-unknown-linux-gnu
181+
- powerpc64le-unknown-linux-gnu
182+
- riscv64gc-unknown-linux-gnu
183+
# MIPS uses a nonstandard binary representation for NaNs which makes it worth testing
195184
# - mips-unknown-linux-gnu
196185
# - mips64-unknown-linux-gnuabi64
197-
- riscv64gc-unknown-linux-gnu
198-
# TODO this test works, but it appears to time out
199-
# - powerpc-unknown-linux-gnu
200-
# TODO this test is broken, but it appears to be a problem with QEMU, not us.
201-
# - powerpc64le-unknown-linux-gnu
202-
# TODO enable this once a new version of cross is released
203-
# - powerpc64-unknown-linux-gnu
186+
target_feature: ["", "+native"]
204187

205188
steps:
206189
- uses: actions/checkout@v2
@@ -217,11 +200,14 @@ jobs:
217200
# being part of the tarball means we can't just use the download/latest
218201
# URL :(
219202
run: |
220-
CROSS_URL=https://github.com/rust-embedded/cross/releases/download/v0.2.1/cross-v0.2.1-x86_64-unknown-linux-gnu.tar.gz
203+
CROSS_URL=https://github.com/cross-rs/cross/releases/download/v0.2.5/cross-x86_64-unknown-linux-gnu.tar.gz
221204
mkdir -p "$HOME/.bin"
222205
curl -sfSL --retry-delay 10 --retry 5 "${CROSS_URL}" | tar zxf - -C "$HOME/.bin"
223206
echo "$HOME/.bin" >> $GITHUB_PATH
224207
208+
- name: Configure RUSTFLAGS
209+
run: echo "-Ctarget-feature=${{ matrix.target_feature }}" >> $GITHUB_ENV
210+
225211
- name: Test (debug)
226212
run: cross test --verbose --target=${{ matrix.target }}
227213

0 commit comments

Comments
 (0)