@@ -204,32 +204,23 @@ jobs:
204
204
target_feature : [default]
205
205
include :
206
206
- { target: powerpc64le-unknown-linux-gnu, target_feature: "+vsx" }
207
+ - { target: riscv64gc-unknown-linux-gnu, target_feature: "+v,+zvl128b" }
207
208
# Fails due to QEMU floating point errors, probably handling subnormals incorrectly.
208
209
# This target is somewhat redundant, since ppc64le has altivec as well.
209
210
# - { target: powerpc-unknown-linux-gnu, target_feature: "+altivec" }
210
- # We should test this, but cross currently can't run it
211
- # - { target: riscv64gc-unknown-linux-gnu, target_feature: "+v,+zvl128b" }
212
211
213
212
steps :
214
213
- uses : actions/checkout@v2
215
214
- name : Setup Rust
216
215
run : rustup target add ${{ matrix.target }}
217
216
218
217
- name : Install Cross
219
- # Equivalent to `cargo install cross`, but downloading a prebuilt
220
- # binary. Ideally we wouldn't hardcode a version, but the version number
221
- # being part of the tarball means we can't just use the download/latest
222
- # URL :(
223
- run : |
224
- CROSS_URL=https://github.com/cross-rs/cross/releases/download/v0.2.5/cross-x86_64-unknown-linux-gnu.tar.gz
225
- mkdir -p "$HOME/.bin"
226
- curl -sfSL --retry-delay 10 --retry 5 "${CROSS_URL}" | tar zxf - -C "$HOME/.bin"
227
- echo "$HOME/.bin" >> $GITHUB_PATH
218
+ run : cargo install cross --git https://github.com/cross-rs/cross --rev d8631fe4f4e8bb4c4b24417a35544857fb42ee22
228
219
229
220
- name : Configure Emulated CPUs
230
221
run : |
231
222
echo "CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_RUNNER=qemu-ppc -cpu e600" >> $GITHUB_ENV
232
- # echo "CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_RUNNER=qemu-riscv64 -cpu rv64,zba=true,zbb=true,v=true,vlen=256,vext_spec=v1.0" >> $GITHUB_ENV
223
+ echo "CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_RUNNER=qemu-riscv64 -cpu rv64,zba=true,zbb=true,v=true,vlen=256,vext_spec=v1.0" >> $GITHUB_ENV
233
224
234
225
- name : Configure RUSTFLAGS
235
226
shell : bash
0 commit comments