Skip to content

Commit

Permalink
Reenable the new backend x64 CI;
Browse files Browse the repository at this point in the history
The intermittent failure have likely been fixed by a recent round of
general fixes in the new x64 backend. This basically reverts
#2100 and uses the CI
script there.
  • Loading branch information
bnjbvr committed Sep 23, 2020
1 parent 3836069 commit 65d5b53
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 1 deletion.
26 changes: 26 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,32 @@ jobs:
env:
RUST_BACKTRACE: 1

# Perform all tests (debug mode) for `wasmtime` with the experimental x64
# backend. This runs on the nightly channel of Rust (because of issues with
# unifying Cargo features on stable) on Ubuntu.
test_x64:
name: Test x64 new backend
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
submodules: true
- uses: ./.github/actions/install-rust
with:
toolchain: nightly-2020-08-25
- uses: ./.github/actions/define-llvm-env

# Install wasm32 targets in order to build various tests throughout the
# repo.
- run: rustup target add wasm32-wasi
- run: rustup target add wasm32-unknown-unknown

# Run the x64 CI script.
- run: ./ci/run-experimental-x64-ci.sh
env:
CARGO_VERSION: '' # Don't precise the Cargo version; the install_rust script should have set the nightly toolchain by default.
RUST_BACKTRACE: 1

# Verify that cranelift's code generation is deterministic
meta_determinist_check:
name: Meta deterministic check
Expand Down
7 changes: 6 additions & 1 deletion ci/run-experimental-x64-ci.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#!/bin/bash

cargo +nightly \
# Use the Nightly variant of the compiler to properly unify the
# experimental_x64 feature across all crates. Once the feature has stabilized
# and become the default, we can remove this.
CARGO_VERSION=${CARGO_VERSION:-"+nightly"}

cargo $CARGO_VERSION \
-Zfeatures=all -Zpackage-features \
test \
--features test-programs/test_programs \
Expand Down

0 comments on commit 65d5b53

Please sign in to comment.