Skip to content

Commit f3de846

Browse files
committed
Auto merge of #137754 - ChrisDenton:downgrade-sdk, r=<try>
[do not merge] fix 32-bit MSVC CI [alt version] r? `@ghost` try-job: i686-msvc-1 try-job: i686-msvc-2 try-job: dist-i686-msvc
2 parents 96cfc75 + e0dff29 commit f3de846

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

.github/workflows/ci.yml

+14
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,20 @@ jobs:
174174
- name: ensure the stable version number is correct
175175
run: src/ci/scripts/verify-stable-version-number.sh
176176

177+
# Temporary fix to unblock CI
178+
# We revert to an older Windows SDK for 32-bit Windows MSVC builds.
179+
# See issue https://github.com/rust-lang/rust/issues/137733 for more details.
180+
- name: Downgrade Windows SDK
181+
shell: powershell
182+
if: ${{ matrix.name == 'i686-msvc-1' || matrix.name == 'i686-msvc-2' || matrix.name == 'dist-i686-msvc' }}
183+
run: |
184+
$env:PATH = "C:\msys64\usr\bin;" + $env:Path
185+
$vs = &"${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -format value -property installationPath
186+
cmd /c "`"$vs\VC\Auxiliary\Build\vcvarsall.bat`" x86 10.0.22621.0 > NUL & SET" > envs.txt
187+
echo "Printing current environment variables"
188+
cat envs.txt
189+
cat envs.txt >> $env:GITHUB_ENV
190+
177191
# Show the environment just before we run the build
178192
# This makes it easier to diagnose problems with the above install scripts.
179193
- name: show the current environment

0 commit comments

Comments
 (0)