Skip to content

Commit

Permalink
Revert "CI: Windows: downgrade rust to 1.77"
Browse files Browse the repository at this point in the history
This reverts commit 1da230c.

Should be fixed now in upstream rustc.
  • Loading branch information
eli-schwartz committed Dec 20, 2024
1 parent e56eea7 commit 21614ac
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions ci/run.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,21 @@ if ($LastExitCode -ne 0) {
$env:Path = ($env:Path.Split(';') | Where-Object { $_ -notmatch 'mingw|Strawberry|Chocolatey|PostgreSQL' }) -join ';'

if ($env:arch -eq 'x64') {
rustup default 1.77
# Rust puts its shared stdlib in a secret place, but it is needed to run tests.
$env:Path += ";$HOME/.rustup/toolchains/1.77-x86_64-pc-windows-msvc/bin"
$env:Path += ";$HOME/.rustup/toolchains/stable-x86_64-pc-windows-msvc/bin"
} elseif ($env:arch -eq 'x86') {
# Switch to the x86 Rust toolchain
rustup default 1.77-i686-pc-windows-msvc
rustup default stable-i686-pc-windows-msvc

# Also install clippy
rustup component add clippy

# Rust puts its shared stdlib in a secret place, but it is needed to run tests.
$env:Path += ";$HOME/.rustup/toolchains/1.77-i686-pc-windows-msvc/bin"
$env:Path += ";$HOME/.rustup/toolchains/stable-i686-pc-windows-msvc/bin"
# Need 32-bit Python for tests that need the Python dependency
$env:Path = "C:\hostedtoolcache\windows\Python\3.7.9\x86;C:\hostedtoolcache\windows\Python\3.7.9\x86\Scripts;$env:Path"
}

# Also install clippy
rustup component add clippy

# Set the CI env var for the meson test framework
$env:CI = '1'

Expand Down

0 comments on commit 21614ac

Please sign in to comment.