Fix raytrace example by using an older nightly

Unfortunately xargo is currently broken against master Rust, so let's
pin to an older nightly while that's sorted out
This commit is contained in:
Alex Crichton 2019-04-25 19:25:32 -07:00
parent 7decb133f0
commit 03299a73b4
2 changed files with 4 additions and 2 deletions

View File

@ -170,15 +170,17 @@ jobs:
steps: steps:
- template: ci/azure-install-rust.yml - template: ci/azure-install-rust.yml
parameters: parameters:
toolchain: nightly toolchain: nightly-2019-04-01
- template: ci/azure-install-sccache.yml - template: ci/azure-install-sccache.yml
- script: rustup component add rust-src - script: rustup component add rust-src
displayName: "install rust-src" displayName: "install rust-src"
- script: | - script: |
set -e
curl -L https://github.com/japaric/xargo/releases/download/v0.3.13/xargo-v0.3.13-x86_64-unknown-linux-musl.tar.gz | tar xzf - curl -L https://github.com/japaric/xargo/releases/download/v0.3.13/xargo-v0.3.13-x86_64-unknown-linux-musl.tar.gz | tar xzf -
echo "##vso[task.setvariable variable=PATH;]$PATH:$PWD" echo "##vso[task.setvariable variable=PATH;]$PATH:$PWD"
displayName: "install xargo" displayName: "install xargo"
- script: | - script: |
set -e
sed -i 's/python/#python/' examples/raytrace-parallel/build.sh sed -i 's/python/#python/' examples/raytrace-parallel/build.sh
(cd examples/raytrace-parallel && ./build.sh) (cd examples/raytrace-parallel && ./build.sh)
cp examples/raytrace-parallel/*.{js,html,wasm} $BUILD_ARTIFACTSTAGINGDIRECTORY cp examples/raytrace-parallel/*.{js,html,wasm} $BUILD_ARTIFACTSTAGINGDIRECTORY

View File

@ -11,7 +11,7 @@ set -ex
# * Next we need to compile everything with the `atomics` feature enabled, # * Next we need to compile everything with the `atomics` feature enabled,
# ensuring that LLVM will generate atomic instructions and such. # ensuring that LLVM will generate atomic instructions and such.
RUSTFLAGS='-C target-feature=+atomics' \ RUSTFLAGS='-C target-feature=+atomics' \
rustup run nightly xargo build --target wasm32-unknown-unknown --release xargo build --target wasm32-unknown-unknown --release
# Threading support is disabled by default in wasm-bindgen, so use an env var # Threading support is disabled by default in wasm-bindgen, so use an env var
# here to turn it on for our bindings generation. Also note that webpack isn't # here to turn it on for our bindings generation. Also note that webpack isn't