Skip to content

Commit 17a87dc

Browse files
committed
Downgrade Win SDK to 10.0.22621.0
1 parent 96cfc75 commit 17a87dc

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

Diff for: .github/workflows/ci.yml

+12-1
Original file line numberDiff line numberDiff line change
@@ -174,14 +174,25 @@ 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: pwsh
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"
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`" amd64_x86 10.0.22621.0 & SET >> `"%GITHUB_ENV%`""
187+
177188
# Show the environment just before we run the build
178189
# This makes it easier to diagnose problems with the above install scripts.
179190
- name: show the current environment
180191
run: src/ci/scripts/dump-environment.sh
181192

182193
- name: run the build
183194
# Redirect stderr to stdout to avoid reordering the two streams in the GHA logs.
184-
run: src/ci/scripts/run-build-from-ci.sh 2>&1
195+
run: exit 1 #src/ci/scripts/run-build-from-ci.sh 2>&1
185196
env:
186197
AWS_ACCESS_KEY_ID: ${{ env.CACHES_AWS_ACCESS_KEY_ID }}
187198
AWS_SECRET_ACCESS_KEY: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}

0 commit comments

Comments
 (0)