Skip to content

Commit 6c37e3e

Browse files
committed
CI: fix xctest.lib path for windows-swift-5.7
1 parent 18e153c commit 6c37e3e

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

azure-pipelines.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,29 +111,33 @@ stages:
111111
SWIFT_VERSION: '5.4.3'
112112
ICU_PATH: 'C:\Library\icu-67\usr\bin'
113113
SWIFT_DEV_PATH: 'C:\Library\Swift-development\bin'
114+
XCTEST_LIB_PATH: ''
114115
windowsSwift55:
115116
imageName: 'windows-2019'
116117
SWIFT_VERSION: '5.5.3'
117118
ICU_PATH: 'C:\Library\icu-67\usr\bin'
118119
SWIFT_DEV_PATH: 'C:\Library\Swift-development\bin'
120+
XCTEST_LIB_PATH: ''
119121
windowsSwift56:
120122
imageName: 'windows-2019'
121123
SWIFT_VERSION: '5.6.3'
122124
ICU_PATH: 'C:\Library\icu-69.1\usr\bin'
123125
SWIFT_DEV_PATH: 'C:\Library\Swift-development\bin'
126+
XCTEST_LIB_PATH: ''
124127
windowsSwift57:
125128
imageName: 'windows-2019'
126129
SWIFT_VERSION: '5.7'
127130
ICU_PATH: 'C:\Program Files\swift\icu-69.1\usr\bin'
128131
SWIFT_DEV_PATH: 'C:\Program Files\swift\runtime-development\usr\bin'
132+
XCTEST_LIB_PATH: '\x86_64'
129133
pool:
130134
vmImage: $(imageName)
131135
variables:
132136
DEVELOPER_DIR: 'C:\Library\Developer'
133137
SDKROOT: 'C:\Library\Developer\Platforms\Windows.platform\Developer\SDKs\Windows.sdk'
134138
SWIFTFLAGS: '--sdk $(SDKROOT)'
135139
XCTEST_DIR: 'C:\Library\Developer\Platforms\Windows.platform\Developer\Library\XCTest-development'
136-
SWIFTTESTFLAGS: '-Xswiftc -I -Xswiftc $(XCTEST_DIR)\usr\lib\swift\windows\x86_64 -Xswiftc -L -Xswiftc $(XCTEST_DIR)\usr\lib\swift\windows -Xswiftc -sdk -Xswiftc $(SDKROOT)'
140+
SWIFTTESTFLAGS: '-Xswiftc -I -Xswiftc $(XCTEST_DIR)\usr\lib\swift\windows\x86_64 -Xswiftc -L -Xswiftc $(XCTEST_DIR)\usr\lib\swift\windows$(XCTEST_LIB_PATH) -Xswiftc -sdk -Xswiftc $(SDKROOT)'
137141
steps:
138142
- pwsh: Invoke-WebRequest -Uri https://swift.org/builds/swift-$(SWIFT_VERSION)-release/windows10/swift-$(SWIFT_VERSION)-RELEASE/swift-$(SWIFT_VERSION)-RELEASE-windows10.exe -OutFile swift-install.exe
139143
displayName: 'Download Swift'

0 commit comments

Comments
 (0)