Skip to content

Commit

Permalink
Auto merge of rust-lang#137754 - ChrisDenton:downgrade-sdk, r=<try>
Browse files Browse the repository at this point in the history
[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
  • Loading branch information
bors committed Feb 27, 2025
2 parents 96cfc75 + ae405e6 commit 975265a
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,14 +174,26 @@ jobs:
- name: ensure the stable version number is correct
run: src/ci/scripts/verify-stable-version-number.sh

# Temporary fix to unblock CI
# We revert to an older Windows SDK for 32-bit Windows MSVC builds.
# See issue https://github.com/rust-lang/rust/issues/137733 for more details.
- name: Downgrade Windows SDK
shell: pwsh
if: ${{ matrix.name == 'i686-msvc-1' || matrix.name == 'i686-msvc-2' || matrix.name == 'dist-i686-msvc' }}
run: |
$env:PATH = "C:\msys64\usr\bin;" + $env:Path
$vs = &"${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -format value -property installationPath
echo $vs
cmd /c "`"$vs\VC\Auxiliary\Build\vcvarsall.bat`" amd64_x86 10.0.22621.0 & SET"
# Show the environment just before we run the build
# This makes it easier to diagnose problems with the above install scripts.
- name: show the current environment
run: src/ci/scripts/dump-environment.sh

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

0 comments on commit 975265a

Please sign in to comment.