Skip to content

Commit ba25dfa

Browse files
committed
Auto merge of #137746 - Kobzol:fix-ci, r=<try>
[do not merge] Another attempt to fix 32-bit MSVC CI r? `@ghost` try-job: i686-msvc-1 try-job: i686-msvc-2 try-job: dist-i686-msvc
2 parents 96cfc75 + 8640942 commit ba25dfa

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

.github/workflows/ci.yml

+12
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,18 @@ jobs:
8686
with:
8787
fetch-depth: 2
8888

89+
# Temporary fix to unblock CI
90+
# We revert to an older Windows SDK for 32-bit Windows MSVC builds.
91+
# See issue https://github.com/rust-lang/rust/issues/137733 for more details.
92+
- shell: powershell
93+
if: ${{ matrix.name == 'i686-msvc-1' || matrix.name == 'i686-msvc-2' || matrix.name == 'dist-i686-msvc' }}
94+
run: |
95+
$vs = &"${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -format value -property installationPath
96+
cmd /c "`"$vs\VC\Auxiliary\Build\vcvarsall.bat`" x86 10.0.22621.0 & SET > envs.txt"
97+
echo "Printing current environment variables"
98+
cat envs.txt
99+
cat envs.txt >> $env:GITHUB_ENV
100+
89101
# Free up disk space on Linux by removing preinstalled components that
90102
# we do not need. We do this to enable some of the less resource
91103
# intensive jobs to run on free runners, which however also have

0 commit comments

Comments
 (0)