Skip to content

Commit 65bac57

Browse files
mcbartonaaronj0
mcbarton
authored and
aaronj0
committed
Add cling 1.2 support
1 parent 88492f2 commit 65bac57

File tree

6 files changed

+56
-38
lines changed

6 files changed

+56
-38
lines changed

‎.github/workflows/MacOS-arm.yml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ jobs:
5757
cling: Off
5858
llvm_enable_projects: "clang"
5959
llvm_targets_to_build: "host"
60-
- name: osx15-arm-clang-clang13-cling
60+
- name: osx15-arm-clang-clang18-cling
6161
os: macos-15
6262
compiler: clang
63-
clang-runtime: '13'
63+
clang-runtime: '18'
6464
cling: On
65-
cling-version: '1.0'
65+
cling-version: '1.2'
6666
llvm_enable_projects: "clang"
6767
llvm_targets_to_build: "host;NVPTX"
6868

@@ -193,8 +193,6 @@ jobs:
193193
../llvm
194194
ninja clang -j ${{ env.ncpus }}
195195
ninja clingInterpreter -j ${{ env.ncpus }}
196-
# Now build gtest.a and gtest_main for CppInterOp to run its tests.
197-
ninja gtest_main -j ${{ env.ncpus }}
198196
else
199197
# Apply patches
200198
llvm_vers=$(echo "${{ matrix.clang-runtime }}" | tr '[:lower:]' '[:upper:]')
@@ -289,12 +287,12 @@ jobs:
289287
clang-runtime: '16'
290288
cling: Off
291289
cppyy: Off
292-
- name: osx15-arm-clang-clang13-cling-cppyy
290+
- name: osx15-arm-clang-clang18-cling-cppyy
293291
os: macos-15
294292
compiler: clang
295-
clang-runtime: '13'
293+
clang-runtime: '18'
296294
cling: On
297-
cling-version: '1.0'
295+
cling-version: '1.2'
298296
cppyy: On
299297

300298
steps:

‎.github/workflows/MacOS.yml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ jobs:
5757
cling: Off
5858
llvm_enable_projects: "clang"
5959
llvm_targets_to_build: "host"
60-
- name: osx13-x86-clang-clang13-cling
60+
- name: osx13-x86-clang-clang18-cling
6161
os: macos-13
6262
compiler: clang
63-
clang-runtime: '13'
63+
clang-runtime: '18'
6464
cling: On
65-
cling-version: '1.0'
65+
cling-version: '1.2'
6666
llvm_enable_projects: "clang"
6767
llvm_targets_to_build: "host;NVPTX"
6868

@@ -177,8 +177,6 @@ jobs:
177177
../llvm
178178
ninja clang -j ${{ env.ncpus }}
179179
ninja clingInterpreter -j ${{ env.ncpus }}
180-
# Now build gtest.a and gtest_main for CppInterOp to run its tests.
181-
ninja gtest_main -j ${{ env.ncpus }}
182180
else
183181
# Apply patches
184182
llvm_vers=$(echo "${{ matrix.clang-runtime }}" | tr '[:lower:]' '[:upper:]')
@@ -273,12 +271,12 @@ jobs:
273271
clang-runtime: '16'
274272
cling: Off
275273
cppyy: Off
276-
- name: osx13-x86-clang-clang13-cling-cppyy
274+
- name: osx13-x86-clang-clang18-cling-cppyy
277275
os: macos-13
278276
compiler: clang
279-
clang-runtime: '13'
277+
clang-runtime: '18'
280278
cling: On
281-
cling-version: '1.0'
279+
cling-version: '1.2'
282280
cppyy: On
283281

284282
steps:

‎.github/workflows/Ubuntu-arm.yml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ jobs:
6464
cling: Off
6565
llvm_enable_projects: "clang"
6666
llvm_targets_to_build: "host;NVPTX"
67-
- name: ubu24-arm-gcc9-clang13-cling
67+
- name: ubu24-arm-gcc9-clang18-cling
6868
os: ubuntu-24.04-arm
6969
compiler: gcc-9
70-
clang-runtime: '13'
70+
clang-runtime: '18'
7171
cling: On
72-
cling-version: '1.0'
72+
cling-version: '1.2'
7373
llvm_enable_projects: "clang"
7474
llvm_targets_to_build: "host;NVPTX"
7575

@@ -188,8 +188,6 @@ jobs:
188188
../llvm
189189
ninja clang -j ${{ env.ncpus }}
190190
ninja clingInterpreter -j ${{ env.ncpus }}
191-
# Now build gtest.a and gtest_main for CppInterOp to run its tests.
192-
ninja gtest_main -j ${{ env.ncpus }}
193191
else
194192
# Apply patches
195193
llvm_vers=$(echo "${{ matrix.clang-runtime }}" | tr '[:lower:]' '[:upper:]')
@@ -291,13 +289,13 @@ jobs:
291289
clang-runtime: '16'
292290
cling: Off
293291
cppyy: Off
294-
- name: ubu24-arm-gcc9-clang13-cling-cppyy
292+
- name: ubu24-arm-gcc9-clang18-cling-cppyy
295293
os: ubuntu-24.04-arm
296294
compiler: gcc-9
297-
clang-runtime: '13'
295+
clang-runtime: '18'
298296
cling: On
299297
cppyy: On
300-
cling-version: '1.0'
298+
cling-version: '1.2'
301299

302300
steps:
303301
- uses: actions/checkout@v4

‎.github/workflows/Ubuntu.yml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ jobs:
5757
cling: Off
5858
llvm_enable_projects: "clang"
5959
llvm_targets_to_build: "host;NVPTX"
60-
- name: ubu24-x86-gcc9-clang13-cling
60+
- name: ubu24-x86-gcc9-clang18-cling
6161
os: ubuntu-24.04
6262
compiler: gcc-9
63-
clang-runtime: '13'
63+
clang-runtime: '18'
6464
cling: On
65-
cling-version: '1.0'
65+
cling-version: '1.2'
6666
llvm_enable_projects: "clang"
6767
llvm_targets_to_build: "host;NVPTX"
6868

@@ -181,8 +181,6 @@ jobs:
181181
../llvm
182182
ninja clang -j ${{ env.ncpus }}
183183
ninja clingInterpreter -j ${{ env.ncpus }}
184-
# Now build gtest.a and gtest_main for CppInterOp to run its tests.
185-
ninja gtest_main -j ${{ env.ncpus }}
186184
else
187185
# Apply patches
188186
llvm_vers=$(echo "${{ matrix.clang-runtime }}" | tr '[:lower:]' '[:upper:]')
@@ -277,12 +275,12 @@ jobs:
277275
clang-runtime: '16'
278276
cling: Off
279277
cppyy: Off
280-
- name: ubu24-x86-gcc9-clang13-cling-cppyy
278+
- name: ubu24-x86-gcc9-clang18-cling-cppyy
281279
os: ubuntu-24.04
282280
compiler: gcc-9
283-
clang-runtime: '13'
281+
clang-runtime: '18'
284282
cling: On
285-
cling-version: '1.0'
283+
cling-version: '1.2'
286284
cppyy: On
287285

288286
steps:

‎.github/workflows/Windows-arm.yml‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@ jobs:
2828
cling: Off
2929
llvm_enable_projects: "clang"
3030
llvm_targets_to_build: "host;NVPTX"
31+
- name: win11-msvc-clang18-cling
32+
os: windows-11-arm
33+
compiler: msvc
34+
clang-runtime: '18'
35+
cling: On
36+
cling-version: '1.2'
37+
llvm_enable_projects: "clang"
38+
llvm_targets_to_build: "host;NVPTX"
3139

3240
steps:
3341
- uses: actions/checkout@v4
@@ -154,9 +162,7 @@ jobs:
154162
-DLLVM_ENABLE_LIBXML2=OFF `
155163
..\llvm
156164
cmake --build . --config Release --target clang --parallel ${{ env.ncpus }}
157-
cmake --build . --config Release --target cling --parallel ${{ env.ncpus }}
158-
# Now build gtest.a and gtest_main for CppInterOp to run its tests.
159-
cmake --build . --config Release --target gtest_main --parallel ${{ env.ncpus }}
165+
cmake --build . --config Release --target clingInterpreter --parallel ${{ env.ncpus }}
160166
}
161167
else
162168
{
@@ -231,6 +237,13 @@ jobs:
231237
clang-runtime: '20'
232238
cling: Off
233239
cppyy: Off
240+
- name: win11-msvc-clang18-cling
241+
os: windows-11-arm
242+
compiler: msvc
243+
clang-runtime: '18'
244+
cling: On
245+
cling-version: '1.2'
246+
cppyy: Off
234247

235248
steps:
236249
- uses: actions/checkout@v4

‎.github/workflows/Windows.yml‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@ jobs:
2828
cling: Off
2929
llvm_enable_projects: "clang"
3030
llvm_targets_to_build: "host;NVPTX"
31+
- name: win2025-msvc-clang18-cling
32+
os: windows-2025
33+
compiler: msvc
34+
clang-runtime: '18'
35+
cling: On
36+
cling-version: '1.2'
37+
llvm_enable_projects: "clang"
38+
llvm_targets_to_build: "host;NVPTX"
3139

3240
steps:
3341
- uses: actions/checkout@v4
@@ -154,9 +162,7 @@ jobs:
154162
-DLLVM_ENABLE_LIBXML2=OFF `
155163
..\llvm
156164
cmake --build . --config Release --target clang --parallel ${{ env.ncpus }}
157-
cmake --build . --config Release --target cling --parallel ${{ env.ncpus }}
158-
# Now build gtest.a and gtest_main for CppInterOp to run its tests.
159-
cmake --build . --config Release --target gtest_main --parallel ${{ env.ncpus }}
165+
cmake --build . --config Release --target clingInterpreter --parallel ${{ env.ncpus }}
160166
}
161167
else
162168
{
@@ -231,6 +237,13 @@ jobs:
231237
clang-runtime: '20'
232238
cling: Off
233239
cppyy: Off
240+
- name: win2025-msvc-clang18-cling
241+
os: windows-2025
242+
compiler: msvc
243+
clang-runtime: '18'
244+
cling: On
245+
cling-version: '1.2'
246+
cppyy: Off
234247

235248
steps:
236249
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)