Skip to content

Commit 9b386cc

Browse files
miriamkwclaude
andcommitted
fix: simplify Windows CI build to resolve SwiftShims error
- Remove complex custom Windows build step with manual MSVC setup - Use unified build script approach for all platforms (Windows, macOS, Linux) - Let SwiftyLab/setup-swift handle Swift 6.0 toolchain configuration automatically - Resolves "missing required module 'SwiftShims'" error 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
1 parent 541e750 commit 9b386cc

1 file changed

Lines changed: 2 additions & 34 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -51,44 +51,12 @@ jobs:
5151
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
5252
pip install pytest
5353
54-
- name: Run build script (Unix)
55-
if: matrix.os != 'windows-latest'
54+
- name: Run build script
55+
shell: bash
5656
run: |
5757
chmod +x build.sh
5858
./build.sh
5959
60-
- name: Build on Windows
61-
if: matrix.os == 'windows-latest'
62-
shell: cmd
63-
run: |
64-
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
65-
66-
set "SWIFT_ROOT=C:\Users\runneradmin\AppData\Local\Programs\Swift"
67-
set "SDKROOT=%SWIFT_ROOT%\Platforms\6.0.3\Windows.platform\Developer\SDKs\Windows.sdk"
68-
69-
:: Adjusting to the platform-specific lib folder
70-
set "RESOURCE_DIR=%SWIFT_ROOT%\Toolchains\6.0.3+Asserts\usr\lib\swift\windows"
71-
72-
echo Verifying Paths...
73-
if not exist "%RESOURCE_DIR%\shims" (
74-
echo "Shims not found in %RESOURCE_DIR%, trying parent..."
75-
set "RESOURCE_DIR=%SWIFT_ROOT%\Toolchains\6.0.3+Asserts\usr\lib\swift"
76-
)
77-
78-
dir "%RESOURCE_DIR%\shims"
79-
80-
echo Starting Build with Corrected Paths...
81-
swift build -c release -v ^
82-
-Xswiftc -resource-dir -Xswiftc "%RESOURCE_DIR%" ^
83-
-Xswiftc -I -Xswiftc "%RESOURCE_DIR%\shims" ^
84-
-Xswiftc -L -Xswiftc "%RESOURCE_DIR%" ^
85-
-Xcc -fno-implicit-modules ^
86-
-Xcc -fno-modules ^
87-
-Xcc -D_CRT_USE_BUILTIN_OFF ^
88-
-Xswiftc -Xfrontend -Xswiftc -disable-implicit-concurrency-module-import
89-
90-
if %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
91-
9260
- name: Verify library was built
9361
shell: bash
9462
run: |

0 commit comments

Comments
 (0)