Skip to content

Commit f51cff1

Browse files
committed
CI: attempt to disable lldb-python-scripts on 5.2
1 parent 72a0862 commit f51cff1

File tree

5 files changed

+12
-2
lines changed

5 files changed

+12
-2
lines changed

.ci/templates/toolchain.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ parameters:
2323
type: string
2424
default: ''
2525

26+
- name: VERSION
27+
type: string
28+
default: 'master'
29+
2630
- name: VisualStudio
2731
type: string
2832
default: ''
@@ -281,9 +285,8 @@ jobs:
281285
displayName: Configure toolchain
282286
inputs:
283287
cmakeArgs:
284-
-G Ninja
285-
-S $(Build.SourcesDirectory)/toolchain/llvm
286288
-B $(Build.BinariesDirectory)/toolchain
289+
-C $(Build.SourcesDirectory)/swift-build/cmake/caches/toolchain-${{ parameters.VERSION }}.cmake
287290
-C $(Build.SourcesDirectory)/swift-build/cmake/caches/${{ parameters.platform }}-${{ parameters.arch }}.cmake
288291
-C $(Build.SourcesDirectory)/swift-build/cmake/caches/org.compnerd.dt.cmake
289292
-D CMAKE_BUILD_TYPE=Release
@@ -298,6 +301,8 @@ jobs:
298301
${{ parameters.LLVM_OPTIONS }}
299302
${{ parameters.LLDB_OPTIONS }}
300303
${{ parameters.SWIFT_OPTIONS }}
304+
-G Ninja
305+
-S $(Build.SourcesDirectory)/toolchain/llvm
301306

302307
- task: CMake@1
303308
displayName: Build toolchain

.ci/vs2017-swift-5.2.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,3 +129,5 @@ stages:
129129

130130
RUN_TESTS: true
131131
RUN_VALIDATION_TESTS: false
132+
133+
VERSION: 5.2

.ci/vs2019-swift-5.2.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ stages:
150150
RUN_TESTS: true
151151
RUN_VALIDATION_TESTS: false
152152

153+
VERSION: 5.2
154+
153155
- stage: android_sdk
154156
dependsOn: toolchain
155157
displayName: 'Android SDK'

cmake/caches/toolchain-5.2.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
set(SWIFT_BUILD_DISABLE_LLDB_PYTHON_SCRIPTS TRUE CACHE BOOL "" FORCE)

cmake/caches/toolchain-master.cmake

Whitespace-only changes.

0 commit comments

Comments
 (0)