From 21614ac00bbec87eefaddb76cd7a25413d3f9752 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Thu, 19 Dec 2024 18:00:44 -0500 Subject: [PATCH] Revert "CI: Windows: downgrade rust to 1.77" This reverts commit 1da230c9e0f66cf7ecf5a9f5fed70e74e15418ac. Should be fixed now in upstream rustc. --- ci/run.ps1 | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/ci/run.ps1 b/ci/run.ps1 index d3fda2d8b70e..d781cf725fce 100644 --- a/ci/run.ps1 +++ b/ci/run.ps1 @@ -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'