Skip to content

Commit d5a958f

Browse files
committed
Fix
1 parent b1521eb commit d5a958f

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

.github/workflows/ci.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,17 @@ jobs:
6262
if: matrix.os == 'windows-2022'
6363
shell: cmd
6464
run: |
65-
:: Initialize the environment with the 'stable' SDK and Toolset
66-
:: This fixes the cyclic dependency and the 'kernel32.lib' error
67-
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" -vcvars_ver=14.29 -win10sdk=10.0.22621.0
65+
:: 1. Correct Argument Order: [arch] [winsdk] [-vcvars_ver]
66+
:: This forces the use of the stable 22621 SDK
67+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" x64 10.0.22621.0 -vcvars_ver=14.29
6868
69-
:: Verify Swift can see the environment
70-
swift --version
69+
:: 2. Clear out the pre-set Runner variables
70+
:: The GitHub Runner sets these to the 'broken' 26100 paths by default.
71+
:: Clearing them lets 'vcvars' and 'swift' do their jobs properly.
72+
set SDKROOT=
73+
set SWIFTFLAGS=
7174
72-
:: Run your bash script using the Git-Bash included in the runner
75+
:: 3. Run the build
7376
bash ./build.sh
7477
7578
- name: Verify library was built

0 commit comments

Comments
 (0)