Skip to content

Commit c4d9f41

Browse files
committed
Attempt to fix CI
1 parent 59e773f commit c4d9f41

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
steps:
102102
- template: ci/azure-install-rust.yml
103103
- template: ci/azure-install-node.yml
104-
- template: ci/azure-install-sccache.yml
104+
#- template: ci/azure-install-sccache.yml
105105
- script: cargo test -p wasm-bindgen-webidl
106106
- script: cargo test -p webidl-tests --target wasm32-unknown-unknown
107107
env:

ci/azure-install-rust.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,20 @@ parameters:
33

44
steps:
55
- bash: |
6-
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $TOOLCHAIN
7-
echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
6+
set -e
7+
if command -v rustup; then
8+
rustup update $TOOLCHAIN
9+
rustup default $TOOLCHAIN
10+
else
11+
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $TOOLCHAIN
12+
echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
13+
fi
814
displayName: Install rust - Unix
915
condition: ne( variables['Agent.OS'], 'Windows_NT' )
1016
env:
1117
TOOLCHAIN: ${{ parameters.toolchain }}
1218
13-
- script: |
14-
curl -sSf -o rustup-init.exe https://win.rustup.rs
15-
rustup-init.exe -y --default-toolchain %TOOLCHAIN%
16-
echo "##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\.cargo\bin"
19+
- bash: rustup update $TOOLCHAIN && rustup default $TOOLCHAIN
1720
displayName: Install rust - Windows
1821
condition: eq( variables['Agent.OS'], 'Windows_NT' )
1922
env:

ci/azure-install-wasm-pack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ steps:
44
- script: |
55
set -ex
66
cargo build -p wasm-bindgen-cli
7-
ln -snf `pwd`/target/debug/wasm-bindgen $HOME/.cargo/bin/wasm-bindgen
7+
ln -snf `pwd`/target/debug/wasm-bindgen $(dirname `which cargo`)/wasm-bindgen
88
displayName: "install wasm-bindgen for `wasm-pack` to use"

0 commit comments

Comments
 (0)