Skip to content

Commit 1d5b406

Browse files
committed
Fix
1 parent 2b48547 commit 1d5b406

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
@@ -65,14 +65,17 @@ jobs:
6565
if: matrix.os == 'windows-2022'
6666
shell: cmd
6767
run: |
68-
:: Initialize the environment with the 'stable' SDK and Toolset
69-
:: This fixes the cyclic dependency and the 'kernel32.lib' error
70-
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" -vcvars_ver=14.29 -win10sdk=10.0.22621.0
68+
:: 1. Correct Argument Order: [arch] [winsdk] [-vcvars_ver]
69+
:: This forces the use of the stable 22621 SDK
70+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" x64 10.0.22621.0 -vcvars_ver=14.29
7171
72-
:: Verify Swift can see the environment
73-
swift --version
72+
:: 2. Clear out the pre-set Runner variables
73+
:: The GitHub Runner sets these to the 'broken' 26100 paths by default.
74+
:: Clearing them lets 'vcvars' and 'swift' do their jobs properly.
75+
set SDKROOT=
76+
set SWIFTFLAGS=
7477
75-
:: Run your bash script using the Git-Bash included in the runner
78+
:: 3. Run the build
7679
bash ./build.sh
7780
7881
- name: Verify library was built

0 commit comments

Comments
 (0)