Skip to content

Commit aa75636

Browse files
committed
ci: set explicitly Rust toolchain on Windows
Change-Id: Ie009079c92ebf1f25724a59dbf59f97f061eff89
1 parent 5eb58b7 commit aa75636

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

packages/host/cmk-agent-ctl/run.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ $package_name = Split-Path -Path (Get-Location) -Leaf
2424

2525
$exe_name = "$package_name.exe"
2626
$work_dir = "$pwd"
27-
#set target=x86_64-pc-windows-mscvc # 64 bit not used now
27+
$cargo_toolchain = "1.87" # to be in sync with rust toolchain/bazel/etc
2828
$cargo_target = "i686-pc-windows-msvc"
2929
$workspace_dir = Split-Path -Path (Get-Location) -Parent
3030
$target_dir = Join-Path -Path $workspace_dir -ChildPath "target/$cargo_target"
@@ -199,8 +199,8 @@ try {
199199
Write-Error "Cargo not found, please install it and/or add to PATH" -ErrorAction Stop
200200
}
201201
&rustup update
202-
&rustup target add $cargo_target
203-
& rustc -V
202+
&rustup target add $cargo_target --toolchain $cargo_toolchain
203+
& rustc --target $cargo_target -V
204204
& cargo -V
205205

206206
# Disable assert()s in C/C++ parts (e.g. wepoll-ffi), they map to _assert()/_wassert(),

packages/host/mk-sql/run.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ $package_name = Split-Path -Path (Get-Location) -Leaf
2424

2525
$exe_name = "$package_name.exe"
2626
$work_dir = "$pwd"
27-
#set target=x86_64-pc-windows-mscvc # 64 bit not used now
27+
$cargo_toolchain = "1.87" # to be in sync with rust toolchain/bazel/etc
2828
$cargo_target = "i686-pc-windows-msvc"
2929
$workspace_dir = Split-Path -Path (Get-Location) -Parent
3030
$target_dir = Join-Path -Path $workspace_dir -ChildPath "target/$cargo_target"
@@ -199,7 +199,7 @@ try {
199199
Write-Error "Cargo not found, please install it and/or add to PATH" -ErrorAction Stop
200200
}
201201
&rustup update
202-
&rustup target add $cargo_target
202+
&rustup target add $cargo_target --toolchain $cargo_toolchain
203203
& rustc -V
204204
& cargo -V
205205

0 commit comments

Comments
 (0)