diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 42ce83ed..efac028e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -104,35 +104,8 @@ stages: strategy: matrix: windowsSwift59: - imageName: 'windows-2019' - SWIFT_VERSION: '5.9.2' - ICU_PATH: 'C:\Program Files\swift\icu-69.1\usr\bin' - SWIFT_DEV_PATH: 'C:\Program Files\swift\runtime-development\usr\bin' - XCTEST_LIB_PATH: '\x86_64' - pool: - vmImage: $(imageName) - variables: - DEVELOPER_DIR: 'C:\Library\Developer' - SDKROOT: 'C:\Library\Developer\Platforms\Windows.platform\Developer\SDKs\Windows.sdk' - SWIFTFLAGS: '--sdk $(SDKROOT) -Xswiftc -sdk -Xswiftc $(SDKROOT) -Xswiftc -resource-dir -Xswiftc $(SDKROOT)/usr/lib/swift -Xswiftc -I -Xswiftc $(SDKROOT)/usr/lib/swift -Xswiftc -L -Xswiftc $(SDKROOT)/usr/lib/swift/windows' - steps: - - 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 - displayName: 'Download Swift' - - task: BatchScript@1 - inputs: - filename: .\swift-install.exe - arguments: /install /quiet - modifyEnvironment: true - displayName: 'Install Swift' - - script: | - set PATH=C:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin;%SWIFT_DEV_PATH%;%ICU_PATH%;%LocalAppData%\Programs\Swift;%PATH% - swift.exe --version - swift.exe build %SWIFTFLAGS% - swift.exe build -c release %SWIFTFLAGS% - displayName: 'Build SPM Debug & Release' - - job: windowsDocker - strategy: - matrix: + imageName: 'windows-2022' + containerImage: 'swift:5.9.2-windowsservercore-ltsc2022' windowsSwift510: imageName: 'windows-2022' containerImage: 'swift:5.10.1-windowsservercore-ltsc2022'