Skip to content

Commit 2281203

Browse files
Update lldb jobs to run on arm 64 machines (#411)
Update lldb-matrix and lldb-sanitized to run on apple SI machines
1 parent 76d656a commit 2281203

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

zorg/jenkins/jobs/jobs/lldb-cmake-matrix

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pipeline {
66
}
77

88
parameters {
9-
string(name: 'LABEL', defaultValue: params.LABEL ?: 'macos-x86_64', description: 'Node label to run on')
9+
string(name: 'LABEL', defaultValue: params.LABEL ?: 'macos-arm64', description: 'Node label to run on')
1010

1111
string(name: 'GIT_SHA', defaultValue: params.GIT_REVISION ?: '*/main', description: 'Git commit to build.')
1212

@@ -21,7 +21,7 @@ pipeline {
2121
}
2222
}
2323
environment {
24-
MATRIX_COMMON_BUILD_PARAMETERS = '--cmake-flag=-DLLVM_TARGETS_TO_BUILD=X86'
24+
MATRIX_COMMON_BUILD_PARAMETERS = '--cmake-flag=-DLLVM_TARGETS_TO_BUILD=X86;AArch64'
2525
PATH="$PATH:/usr/bin:/usr/local/bin"
2626
}
2727
stages {
@@ -102,7 +102,7 @@ pipeline {
102102
--runtimes="libcxx;libcxxabi;libunwind" \
103103
--cmake-type=Release \
104104
--dotest-flag="--skip-category gmodules" \
105-
--dotest-flag="--arch=x86_64"
105+
--dotest-flag="--arch=arm64"
106106
'''
107107
script {
108108
def LLDB = new org.swift.LLDB()
@@ -129,11 +129,11 @@ pipeline {
129129
--dotest-flag="gmodules" \
130130
--dotest-flag="--skip-category" \
131131
--dotest-flag="watchpoint" \
132-
--dotest-flag="--skip-category" \
133-
--dotest-flag="llgs" \
134-
--dotest-flag="--skip-category" \
135-
--dotest-flag="debugserver" \
136-
--dotest-flag="--arch=x86_64" \
132+
--dotest-flag="--skip-category" \
133+
--dotest-flag="llgs" \
134+
--dotest-flag="--skip-category" \
135+
--dotest-flag="debugserver" \
136+
--dotest-flag="--arch=arm64" \
137137
--dotest-flag="--dwarf-version=2"
138138
139139
# Give the system some time to recover.
@@ -165,7 +165,7 @@ pipeline {
165165
--dotest-flag="llgs" \
166166
--dotest-flag="--skip-category" \
167167
--dotest-flag="debugserver" \
168-
--dotest-flag="--arch=x86_64" \
168+
--dotest-flag="--arch=arm64" \
169169
--dotest-flag="--dwarf-version=4"
170170
171171
# Give the system some time to recover.
@@ -197,7 +197,7 @@ pipeline {
197197
--dotest-flag="llgs" \
198198
--dotest-flag="--skip-category" \
199199
--dotest-flag="debugserver" \
200-
--dotest-flag="--arch=x86_64" \
200+
--dotest-flag="--arch=arm64" \
201201
--dotest-flag="--dwarf-version=5"
202202
203203
# Give the system some time to recover.
@@ -266,7 +266,7 @@ pipeline {
266266
--dotest-flag="llgs" \
267267
--dotest-flag="--skip-category" \
268268
--dotest-flag="debugserver" \
269-
--dotest-flag="--arch=x86_64"
269+
--dotest-flag="--arch=arm64"
270270
271271
# Give the system some time to recover.
272272
sleep 120
@@ -336,7 +336,7 @@ pipeline {
336336
--dotest-flag="llgs" \
337337
--dotest-flag="--skip-category" \
338338
--dotest-flag="debugserver" \
339-
--dotest-flag="--arch=x86_64"
339+
--dotest-flag="--arch=arm64"
340340
341341
# Give the system some time to recover.
342342
sleep 120

zorg/jenkins/jobs/jobs/lldb-cmake-sanitized

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pipeline {
55
}
66

77
parameters {
8-
string(name: 'LABEL', defaultValue: params.LABEL ?: 'macos-x86_64', description: 'Node label to run on')
8+
string(name: 'LABEL', defaultValue: params.LABEL ?: 'macos-arm64', description: 'Node label to run on')
99

1010
string(name: 'GIT_SHA', defaultValue: params.GIT_REVISION ?: '*/main', description: 'Git commit to build.')
1111

0 commit comments

Comments
 (0)