diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d57bc4d3..70a05351 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -101,7 +101,7 @@ jobs: steps: - template: ci/azure-install-rust.yml - template: ci/azure-install-node.yml - - template: ci/azure-install-sccache.yml + #- template: ci/azure-install-sccache.yml - script: cargo test -p wasm-bindgen-webidl - script: cargo test -p webidl-tests --target wasm32-unknown-unknown env: @@ -128,7 +128,7 @@ jobs: cd wabt/build cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=off -DCMAKE_CXX_COMPILER_LAUNCHER=$RUSTC_WRAPPER cmake --build . -- -j$(nproc) - echo "##vso[task.setvariable variable=PATH;]$PATH:$PWD" + echo "##vso[task.prependpath]$PWD" - script: cargo test -p wasm-bindgen-wasm-interpreter - job: test_typescript_output @@ -171,7 +171,7 @@ jobs: - 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 - - echo "##vso[task.setvariable variable=PATH;]$PATH:$PWD" + echo "##vso[task.prependpath]$PWD" displayName: "install xargo" - script: | set -e diff --git a/ci/azure-install-rust.yml b/ci/azure-install-rust.yml index dd4ac1c0..6eeac289 100644 --- a/ci/azure-install-rust.yml +++ b/ci/azure-install-rust.yml @@ -3,17 +3,20 @@ parameters: steps: - bash: | - curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $TOOLCHAIN - echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin" + set -e + if command -v rustup; then + rustup update $TOOLCHAIN + rustup default $TOOLCHAIN + else + curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $TOOLCHAIN + echo "##vso[task.prependpath]$HOME/.cargo/bin" + fi displayName: Install rust - Unix condition: ne( variables['Agent.OS'], 'Windows_NT' ) env: TOOLCHAIN: ${{ parameters.toolchain }} - - script: | - curl -sSf -o rustup-init.exe https://win.rustup.rs - rustup-init.exe -y --default-toolchain %TOOLCHAIN% - echo "##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\.cargo\bin" + - bash: rustup update --no-self-update $TOOLCHAIN && rustup default $TOOLCHAIN displayName: Install rust - Windows condition: eq( variables['Agent.OS'], 'Windows_NT' ) env: diff --git a/ci/azure-install-wasm-pack.yml b/ci/azure-install-wasm-pack.yml index 4759d82e..8afcbee2 100644 --- a/ci/azure-install-wasm-pack.yml +++ b/ci/azure-install-wasm-pack.yml @@ -4,5 +4,5 @@ steps: - script: | set -ex cargo build -p wasm-bindgen-cli - ln -snf `pwd`/target/debug/wasm-bindgen $HOME/.cargo/bin/wasm-bindgen + ln -snf `pwd`/target/debug/wasm-bindgen $(dirname `which cargo`)/wasm-bindgen displayName: "install wasm-bindgen for `wasm-pack` to use"