Skip to content

Commit 29b946c

Browse files
authored
swift-atomics: repair configure and add testing
This completes the support for swift-atomics builds and even adds testing support.
1 parent 5fc314d commit 29b946c

File tree

1 file changed

+26
-2
lines changed

1 file changed

+26
-2
lines changed

swift-atomcis.yml

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ variables:
2424
toolchain.directory: $(Pipeline.Workspace)/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain
2525
sdk.directory: $(Pipeline.Workspace)/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk
2626
developer.directory: $(Pipeline.Workspace)/Library/Developer/Platforms/Windows.platform/Developer/Library
27+
icu.directory: $(Pipeline.Workspace)/Library/icu-67
2728

2829
steps:
2930
- script: |
@@ -72,6 +73,16 @@ steps:
7273
artifactName: 'sdk-windows-x64'
7374
targetPath: '$(Pipeline.Workspace)'
7475

76+
- task: DownloadPipelineArtifact@2
77+
inputs:
78+
buildType: 'specific'
79+
project: '3133d6ab-80a8-4996-ac4f-03df25cd3224'
80+
definition: '9'
81+
buildVersionToDownload: 'latest'
82+
allowPartiallySucceededBuilds: true
83+
artifactName: 'icu-windows-x64'
84+
targetPath: '$(Pipeline.Workspace)'
85+
7586
- task: BatchScript@1
7687
displayName: VsDevCmd
7788
inputs:
@@ -98,7 +109,7 @@ steps:
98109
-D BUILD_SHARED_LIBS=YES
99110
-D CMAKE_BUILD_TYPE=Release
100111
-D CMAKE_INSTALL_PREFIX=$(Build.StagingDirectory)/swift-atomics-windows-x64/Library/swift-atomics/usr
101-
-D CMake_Swift_FLAGS="-sdk $(sdk.directory) -resource-dir $(sdk.directory)/usr/lib/swift -I$(sdk.directory)/usr/lib/swift -L$(sdk.directory)/usr/lib/swift/windows -I$(developer.directory)/XCTest-development/usr/lib/swift/windows/x86_64 -L$(developer.directory)/XCTest-development/usr/lib/swift/windows"
112+
-D CMAKE_Swift_FLAGS="-resource-dir $(sdk.directory)/usr/lib/swift -L$(sdk.directory)/usr/lib/swift/windows -I$(developer.directory)/XCTest-development/usr/lib/swift/windows/x86_64 -L$(developer.directory)/XCTest-development/usr/lib/swift/windows"
102113
-G Ninja
103114
-S $(Build.SourcesDirectory)
104115

@@ -113,4 +124,17 @@ steps:
113124
cmakeArgs: --build $(Build.BinariesDirectory)/swift-atomics --target install
114125

115126
- publish: $(Build.StagingDirectory)/swift-atomics-windows-x64
116-
artifact: swift-atomics-windows-x64
127+
artifact: swift-atomics-windows-x64
128+
129+
- script: |
130+
echo ##vso[task.prependpath]$(icu.directory)/usr/bin
131+
echo ##vso[task.prependpath]$(sdk.directory)/usr/bin
132+
echo ##vso[task.prependpath]$(developer.directory)/XCTest-development/usr/bin
133+
echo ##vso[task.setvariable variable=CTEST_OUTPUT_ON_FAILURE]1
134+
displayName: Configure CTest
135+
136+
- task: CMake@1
137+
continueOnError: true
138+
displayName: Test swift-atomics
139+
inputs:
140+
cmakeArgs: --build $(Build.BinariesDirectory)/swift-atomics --target test

0 commit comments

Comments
 (0)