@@ -34,11 +34,7 @@ pipeline {
34
34
parameters {
35
35
string(name : ' LABEL' , defaultValue : params. LABEL ?: ' macos-x86_64' , description : ' Node label to run on' )
36
36
string(name : ' GIT_SHA' , defaultValue : params. GIT_REVISION ?: ' */release/19.x' , description : ' Git commit to build.' )
37
-
38
- // TODO: we should get LLDB as an artifact from the lldb-cmake-intel/latest job. Said job doesn't currently
39
- // publish LLDB/Clang as an artifact however. So instead we build Clang/LLDB from top-of-tree main.
40
- // string(name: 'ARTIFACT', defaultValue: params.ARTIFACT ?: 'lldb-cmake-intel/latest', description: 'Clang/LLDB artifact to use')
41
-
37
+ string(name : ' ARTIFACT' , defaultValue : params. ARTIFACT ?: ' llvm.org/lldb-cmake/latest' , description : ' Clang/LLDB artifact to use' )
42
38
booleanParam(name : ' CLEAN' , defaultValue : params. CLEAN ?: false , description : ' Wipe the build directory?' )
43
39
}
44
40
@@ -67,16 +63,6 @@ pipeline {
67
63
noTags : true , timeout : 30 ]
68
64
]])
69
65
}
70
- dir(' src/host-main' ) {
71
- checkout([$class : ' GitSCM' , branches : [
72
- [name : ' */main' ]
73
- ], userRemoteConfigs : [
74
- [url : ' https://github.com/llvm/llvm-project.git' ]
75
- ], extensions : [
76
- [$class : ' CloneOption' ,
77
- noTags : true , timeout : 30 ]
78
- ]])
79
- }
80
66
dir(' llvm-zorg' ) {
81
67
checkout([$class : ' GitSCM' , branches : [
82
68
[name : ' */main' ]
@@ -102,52 +88,19 @@ pipeline {
102
88
'''
103
89
}
104
90
}
105
- stage(' Build (host) ' ) {
91
+ stage(' Fetch Artifact ' ) {
106
92
environment {
107
93
PATH = " $PATH :/usr/bin:/usr/local/bin"
108
- SRC = " $WORKSPACE /src"
109
- HOST_SRC = " $WORKSPACE /src/host-main"
110
- HOST_BUILD = " $WORKSPACE /host-main-build"
111
94
}
112
95
steps {
113
96
withCredentials([string(credentialsId : ' s3_resource_bucket' , variable : ' S3_BUCKET' )]) {
114
- sh '''
115
- source ./venv/bin/activate
116
-
117
- cd $HOST_SRC
118
- git tag -a -m "First Commit" first_commit 97724f18c79c7cc81ced24239eb5e883bf1398ef || true
119
-
120
- git_desc=$(git describe --match "first_commit")
121
- export GIT_DISTANCE=$(echo ${git_desc} | cut -f 2 -d "-")
122
-
123
- sha=$(echo ${git_desc} | cut -f 3 -d "-")
124
- export GIT_SHA=${sha:1}
125
-
126
- cd -
127
-
128
- set -eux
129
-
130
- $CXX --version
131
- LLVM_REV=${GIT_DISTANCE}
132
-
133
- mkdir -p host-main-src
134
- mkdir -p host-main-build
135
- rsync -a $HOST_SRC/ host-main-src/
136
- cd host-main-build
137
- cmake ../host-main-src/llvm \
138
- -DCMAKE_BUILD_TYPE=Release \
139
- -DLLVM_ENABLE_PROJECTS="clang;lldb" \
140
- -DLLVM_ENABLE_ASSERTIONS=Off \
141
- -DLLVM_ENABLE_MODULES=Off \
142
- -DLLDB_INCLUDE_TESTS=Off \
143
- -DLLDB_ENABLE_PYTHON=On \
144
- -DLLDB_ENABLE_LUA=Off \
145
- -DLLVM_TARGETS_TO_BUILD='X86;AArch64' \
146
- -DCMAKE_EXPORT_COMPILE_COMMANDS=On \
147
- -G Ninja
148
- cmake --build .
149
- cd ../..
150
- '''
97
+ sh """
98
+ source ./venv/bin/activate
99
+ echo "ARTIFACT=${ params.ARTIFACT} "
100
+ python llvm-zorg/zorg/jenkins/monorepo_build.py fetch
101
+ ls $WORKSPACE /host-compiler/lib/clang/
102
+ VERSION=`ls $WORKSPACE /host-compiler/lib/clang/`
103
+ """
151
104
}
152
105
}
153
106
}
@@ -158,8 +111,8 @@ pipeline {
158
111
BUILD = " $WORKSPACE /clang-19-build"
159
112
HOST_BUILD = " $WORKSPACE /clang-19-build"
160
113
HISTORIC_COMPILER = " clang-19"
161
- CC = " $WORKSPACE /host-main-build /bin/clang"
162
- CXX = " $WORKSPACE /host-main-build /bin/clang++"
114
+ CC = " $WORKSPACE /host-compiler /bin/clang"
115
+ CXX = " $WORKSPACE /host-compiler /bin/clang++"
163
116
}
164
117
steps {
165
118
withCredentials([string(credentialsId : ' s3_resource_bucket' , variable : ' S3_BUCKET' )]) {
@@ -207,8 +160,8 @@ pipeline {
207
160
}
208
161
stage(' Run metrics' ) {
209
162
environment {
210
- HOST_BUILD_DIR = " $WORKSPACE /host-build "
211
- HISTORIC_BUILD_DIR = " $WORKSPACE /clang-19-build/tools/clang/stage2-bins "
163
+ HOST_BUILD_DIR = " $WORKSPACE /host-compiler "
164
+ HISTORIC_BUILD_DIR = " $WORKSPACE /clang-19-build"
212
165
}
213
166
steps {
214
167
sh '''
0 commit comments