Skip to content

Commit 199e18e

Browse files
mcbartonmcbarton
authored
Merge pull request #140 from Vipul-Cariappa/dev/cling1.2
Update cling from `v1.0` to `v1.2`
2 parents d3db916 + 1bfb4ba commit 199e18e

File tree

3 files changed

+41
-31
lines changed

3 files changed

+41
-31
lines changed

‎.github/workflows/MacOS.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ jobs:
4343
cling: Off
4444
llvm_enable_projects: "clang"
4545
llvm_targets_to_build: "host"
46-
- name: osx15-arm-clang-clang13-cling
46+
- name: osx15-arm-clang-clang18-cling
4747
os: macos-15
4848
compiler: clang
49-
clang-runtime: '13'
49+
clang-runtime: '18'
5050
cling: On
51-
cling-version: '1.0'
51+
cling-version: '1.2'
5252
llvm_enable_projects: "clang"
5353
llvm_targets_to_build: "host;NVPTX"
5454
- name: osx13-x86-clang-clang-repl-19
@@ -72,12 +72,12 @@ jobs:
7272
cling: Off
7373
llvm_enable_projects: "clang"
7474
llvm_targets_to_build: "host"
75-
- name: osx13-x86-clang-clang13-cling
75+
- name: osx13-x86-clang-clang18-cling
7676
os: macos-13
7777
compiler: clang
78-
clang-runtime: '13'
78+
clang-runtime: '18'
7979
cling: On
80-
cling-version: '1.0'
80+
cling-version: '1.2'
8181
llvm_enable_projects: "clang"
8282
llvm_targets_to_build: "host;NVPTX"
8383

@@ -192,6 +192,7 @@ jobs:
192192
git clone https://github.com/root-project/cling.git
193193
cd ./cling
194194
git checkout tags/v${{ matrix.cling-version }}
195+
git apply -v ${{ github.workspace }}/CppInterOp/patches/llvm/cling1.2-LookupHelper.patch
195196
cd ..
196197
git clone --depth=1 -b cling-llvm${{ matrix.clang-runtime }} https://github.com/root-project/llvm-project.git
197198
else # repl
@@ -218,9 +219,8 @@ jobs:
218219
-G Ninja \
219220
../llvm
220221
ninja clang -j ${{ env.ncpus }}
221-
ninja cling -j ${{ env.ncpus }}
222-
# Now build gtest.a and gtest_main for CppInterOp to run its tests.
223-
ninja gtest_main -j ${{ env.ncpus }}
222+
ninja LLVMOrcDebugging -j ${{ env.ncpus }}
223+
ninja clingInterpreter -j ${{ env.ncpus }}
224224
else
225225
# Apply patches
226226
llvm_vers=$(echo "${{ matrix.clang-runtime }}" | tr '[:lower:]' '[:upper:]')
@@ -298,12 +298,12 @@ jobs:
298298
clang-runtime: '17'
299299
cling: Off
300300
cppyy: On
301-
- name: osx15-arm-clang-clang13-cling-cppyy
301+
- name: osx15-arm-clang-clang18-cling-cppyy
302302
os: macos-15
303303
compiler: clang
304-
clang-runtime: '13'
304+
clang-runtime: '18'
305305
cling: On
306-
cling-version: '1.0'
306+
cling-version: '1.2'
307307
cppyy: On
308308
- name: osx13-x86-clang-clang-repl-19-cppyy
309309
os: macos-13
@@ -323,12 +323,12 @@ jobs:
323323
clang-runtime: '17'
324324
cling: Off
325325
cppyy: On
326-
- name: osx13-x86-clang-clang13-cling-cppyy
326+
- name: osx13-x86-clang-clang18-cling-cppyy
327327
os: macos-13
328328
compiler: clang
329-
clang-runtime: '13'
329+
clang-runtime: '18'
330330
cling: On
331-
cling-version: '1.0'
331+
cling-version: '1.2'
332332
cppyy: On
333333

334334
steps:

‎.github/workflows/Ubuntu.yml

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ jobs:
4343
cling: Off
4444
llvm_enable_projects: "clang"
4545
llvm_targets_to_build: "host;NVPTX"
46-
- name: ubu22-x86-gcc9-clang13-cling
46+
- name: ubu22-x86-gcc9-clang18-cling
4747
os: ubuntu-22.04
4848
compiler: gcc-9
49-
clang-runtime: '13'
49+
clang-runtime: '18'
5050
cling: On
51-
cling-version: '1.0'
51+
cling-version: '1.2'
5252
llvm_enable_projects: "clang"
5353
llvm_targets_to_build: "host;NVPTX"
5454
- name: ubu22-arm-gcc12-clang-repl-19
@@ -72,12 +72,12 @@ jobs:
7272
cling: Off
7373
llvm_enable_projects: "clang"
7474
llvm_targets_to_build: "host;NVPTX"
75-
- name: ubu22-arm-gcc9-clang13-cling
75+
- name: ubu22-arm-gcc9-clang18-cling
7676
os: ubuntu-22.04-arm
7777
compiler: gcc-9
78-
clang-runtime: '13'
78+
clang-runtime: '18'
7979
cling: On
80-
cling-version: '1.0'
80+
cling-version: '1.2'
8181
llvm_enable_projects: "clang"
8282
llvm_targets_to_build: "host;NVPTX"
8383

@@ -171,6 +171,7 @@ jobs:
171171
git clone https://github.com/root-project/cling.git
172172
cd ./cling
173173
git checkout tags/v${{ matrix.cling-version }}
174+
git apply -v ${{ github.workspace }}/CppInterOp/patches/llvm/cling1.2-LookupHelper.patch
174175
cd ..
175176
git clone --depth=1 -b cling-llvm${{ matrix.clang-runtime }} https://github.com/root-project/llvm-project.git
176177
else # repl
@@ -197,9 +198,8 @@ jobs:
197198
-G Ninja \
198199
../llvm
199200
ninja clang -j ${{ env.ncpus }}
200-
ninja cling -j ${{ env.ncpus }}
201-
# Now build gtest.a and gtest_main for CppInterOp to run its tests.
202-
ninja gtest_main -j ${{ env.ncpus }}
201+
ninja LLVMOrcDebugging -j ${{ env.ncpus }}
202+
ninja clingInterpreter -j ${{ env.ncpus }}
203203
else
204204
# Apply patches
205205
llvm_vers=$(echo "${{ matrix.clang-runtime }}" | tr '[:lower:]' '[:upper:]')
@@ -277,12 +277,12 @@ jobs:
277277
clang-runtime: '17'
278278
cling: Off
279279
cppyy: On
280-
- name: ubu22-x86-gcc9-clang13-cling-cppyy
280+
- name: ubu22-x86-gcc9-clang18-cling-cppyy
281281
os: ubuntu-22.04
282282
compiler: gcc-9
283-
clang-runtime: '13'
283+
clang-runtime: '18'
284284
cling: On
285-
cling-version: '1.0'
285+
cling-version: '1.2'
286286
cppyy: On
287287
- name: ubu22-arm-gcc12-clang-repl-19
288288
os: ubuntu-22.04-arm
@@ -302,12 +302,12 @@ jobs:
302302
clang-runtime: '17'
303303
cling: Off
304304
cppyy: Off
305-
- name: ubu22-arm-gcc9-clang13-cling
305+
- name: ubu22-arm-gcc9-clang18-cling-cppyy
306306
os: ubuntu-22.04-arm
307307
compiler: gcc-9
308-
clang-runtime: '13'
308+
clang-runtime: '18'
309309
cling: On
310-
cling-version: '1.0'
310+
cling-version: '1.2'
311311
cppyy: Off
312312

313313
steps:
@@ -588,7 +588,16 @@ jobs:
588588
589589
echo "Running valgrind on passing tests"
590590
CLANG_VERSION="${{ matrix.clang-runtime }}"
591-
SUPPRESSION_FILE="../etc/clang${CLANG_VERSION}-valgrind.supp"
591+
if [[ "${{ matrix.cling }}" == "On" ]]; then
592+
CLANG_INTERPRETER="cling"
593+
else
594+
CLANG_INTERPRETER="clang"
595+
fi
596+
if [[ "${{ matrix.os }}" == *"arm"* ]]; then
597+
SUPPRESSION_FILE="../etc/${CLANG_INTERPRETER}${CLANG_VERSION}-valgrind_arm.supp"
598+
else
599+
SUPPRESSION_FILE="../etc/${CLANG_INTERPRETER}${CLANG_VERSION}-valgrind.supp"
600+
fi
592601
valgrind --show-error-list=yes --error-exitcode=1 --track-origins=yes --suppressions="${SUPPRESSION_FILE}" --suppressions=../etc/valgrind-cppyy-cling.supp python -m pytest -m "not xfail" -sv -ra
593602
export RETCODE=+$?
594603
echo ::endgroup::

‎.github/workflows/Windows.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ jobs:
124124
git clone https://github.com/root-project/cling.git
125125
cd ./cling
126126
git checkout tags/v${{ matrix.cling-version }}
127+
git apply -v ${{ github.workspace }}/CppInterOp/patches/llvm/cling1.2-LookupHelper.patch
127128
cd ..
128129
git clone --depth=1 -b cling-llvm${{ matrix.clang-runtime }} https://github.com/root-project/llvm-project.git
129130
$env:PWD_DIR= $PWD.Path

0 commit comments

Comments
 (0)