Skip to content

Commit 18e153c

Browse files
committed
Fix windows CI builds by setting icu path and some other path
1 parent c92cdfd commit 18e153c

1 file changed

Lines changed: 16 additions & 8 deletions

File tree

azure-pipelines.yml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,23 @@ stages:
109109
windowsSwift54:
110110
imageName: 'windows-2019'
111111
SWIFT_VERSION: '5.4.3'
112+
ICU_PATH: 'C:\Library\icu-67\usr\bin'
113+
SWIFT_DEV_PATH: 'C:\Library\Swift-development\bin'
112114
windowsSwift55:
113115
imageName: 'windows-2019'
114116
SWIFT_VERSION: '5.5.3'
115-
# windowsSwift56:
116-
# imageName: 'windows-2019'
117-
# SWIFT_VERSION: '5.6.3'
118-
# windowsSwift57:
119-
# imageName: 'windows-2019'
120-
# SWIFT_VERSION: '5.7'
117+
ICU_PATH: 'C:\Library\icu-67\usr\bin'
118+
SWIFT_DEV_PATH: 'C:\Library\Swift-development\bin'
119+
windowsSwift56:
120+
imageName: 'windows-2019'
121+
SWIFT_VERSION: '5.6.3'
122+
ICU_PATH: 'C:\Library\icu-69.1\usr\bin'
123+
SWIFT_DEV_PATH: 'C:\Library\Swift-development\bin'
124+
windowsSwift57:
125+
imageName: 'windows-2019'
126+
SWIFT_VERSION: '5.7'
127+
ICU_PATH: 'C:\Program Files\swift\icu-69.1\usr\bin'
128+
SWIFT_DEV_PATH: 'C:\Program Files\swift\runtime-development\usr\bin'
121129
pool:
122130
vmImage: $(imageName)
123131
variables:
@@ -136,13 +144,13 @@ stages:
136144
modifyEnvironment: true
137145
displayName: 'Install Swift'
138146
- script: |
139-
set PATH=C:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin;C:\Library\Swift-development\bin;C:\Library\icu-67\usr\bin;%PATH%
147+
set PATH=C:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin;%SWIFT_DEV_PATH%;%ICU_PATH%;%PATH%
140148
swift.exe --version
141149
swift.exe build %SWIFTFLAGS%
142150
swift.exe test --filter BitByteDataTests %SWIFTFLAGS% %SWIFTTESTFLAGS%
143151
displayName: 'Build & Test'
144152
- script: |
145-
set PATH=C:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin;C:\Library\Swift-development\bin;C:\Library\icu-67\usr\bin;%PATH%
153+
set PATH=C:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin;%SWIFT_DEV_PATH%;%ICU_PATH%;%PATH%
146154
swift.exe --version
147155
swift.exe build -c release %SWIFTFLAGS%
148156
displayName: 'Build Release'

0 commit comments

Comments
 (0)