Skip to content

Commit a77c4bb

Browse files
committed
CI updates: disable swift 5.6 on windows (since I cannot make it work), optimize windows CI config
1 parent ebe908b commit a77c4bb

1 file changed

Lines changed: 4 additions & 16 deletions

File tree

azure-pipelines.yml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -112,24 +112,18 @@ stages:
112112
windowsSwift55:
113113
imageName: 'windows-2019'
114114
SWIFT_VERSION: '5.5.3'
115-
windowsSwift56:
116-
imageName: 'windows-2019'
117-
SWIFT_VERSION: '5.6.1'
115+
# windowsSwift56:
116+
# imageName: 'windows-2019'
117+
# SWIFT_VERSION: '5.6.1'
118118
pool:
119119
vmImage: $(imageName)
120120
variables:
121121
DEVELOPER_DIR: 'C:\Library\Developer'
122122
SDKROOT: 'C:\Library\Developer\Platforms\Windows.platform\Developer\SDKs\Windows.sdk'
123-
XCTEST_DIR: 'C:\Library\Developer\Platforms\Windows.platform\Developer\Library\XCTest-development'
124123
SWIFTFLAGS: '--sdk $(SDKROOT)'
124+
XCTEST_DIR: 'C:\Library\Developer\Platforms\Windows.platform\Developer\Library\XCTest-development'
125125
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)'
126126
steps:
127-
- task: BatchScript@1
128-
inputs:
129-
filename: C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/Common7/Tools/VsDevCmd.bat
130-
arguments: -no_logo -arch=x64 -host_arch=x64
131-
modifyEnvironment: true
132-
displayName: 'vsvarsall.bat'
133127
- 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
134128
displayName: 'Download Swift'
135129
- task: BatchScript@1
@@ -138,12 +132,6 @@ stages:
138132
arguments: /install /quiet
139133
modifyEnvironment: true
140134
displayName: 'Install Swift'
141-
- script: |
142-
copy %SDKROOT%\usr\share\ucrt.modulemap "%UniversalCRTSdkDir%\Include\%UCRTVersion%\ucrt\module.modulemap"
143-
copy %SDKROOT%\usr\share\visualc.modulemap "%VCToolsInstallDir%\include\module.modulemap"
144-
copy %SDKROOT%\usr\share\visualc.apinotes "%VCToolsInstallDir%\include\visualc.apinotes"
145-
copy %SDKROOT%\usr\share\winsdk.modulemap "%UniversalCRTSdkDir%\Include\%UCRTVersion%\um\module.modulemap"
146-
displayName: 'Configure SDK'
147135
- script: |
148136
set PATH=C:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin;C:\Library\Swift-development\bin;C:\Library\icu-67\usr\bin;%PATH%
149137
swift.exe --version

0 commit comments

Comments
 (0)