Skip to content

Commit a3111e0

Browse files
mcbartonmcbarton
authored
Merge branch 'main' into Update-to-llvm-20
2 parents 641da6a + c3384fb commit a3111e0

33 files changed

+997
-434
lines changed

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

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ jobs:
6565
cling-version: '1.0'
6666
llvm_enable_projects: "clang"
6767
llvm_targets_to_build: "host;NVPTX"
68-
68+
6969
steps:
7070
- uses: actions/checkout@v4
7171
with:
7272
fetch-depth: 0
7373

74-
- name: Set up Python
74+
- name: Set up Python
7575
uses: actions/setup-python@v5
7676
with:
7777
python-version: '3.11'
@@ -94,7 +94,7 @@ jobs:
9494
fi
9595
9696
echo "CLING_HASH=$CLING_HASH" >> $GITHUB_ENV
97-
echo "LLVM_HASH=$LLVM_HASH" >> $GITHUB_ENV
97+
echo "LLVM_HASH=$LLVM_HASH" >> $GITHUB_ENV
9898
9999
- name: Restore Cache LLVM/Clang runtime build directory
100100
uses: actions/cache/restore@v4
@@ -123,7 +123,7 @@ jobs:
123123
echo "CXX=g++-${vers}" >> $GITHUB_ENV
124124
else
125125
cling_on=$(echo "${{ matrix.cling }}" | tr '[:lower:]' '[:upper:]')
126-
if [[ "${cling_on}" == "ON" ]]; then
126+
if [[ "${cling_on}" == "ON" ]]; then
127127
brew install llvm@15
128128
brew remove llvm@18
129129
brew cleanup
@@ -154,7 +154,7 @@ jobs:
154154
brew unlink "$pkg"
155155
brew link --overwrite "$pkg"
156156
done
157-
brew upgrade openssl >/dev/null 2>&1
157+
brew upgrade openssl >/dev/null 2>&1
158158
brew upgrade
159159
brew install ninja
160160
@@ -164,7 +164,7 @@ jobs:
164164
cling_on=$(echo "${{ matrix.cling }}" | tr '[:lower:]' '[:upper:]')
165165
if [[ "${cling_on}" == "ON" ]]; then
166166
git clone https://github.com/root-project/cling.git
167-
cd ./cling
167+
cd ./cling
168168
git checkout tags/v${{ matrix.cling-version }}
169169
cd ..
170170
git clone --depth=1 -b cling-llvm${{ matrix.clang-runtime }} https://github.com/root-project/llvm-project.git
@@ -232,7 +232,8 @@ jobs:
232232
rm -rf $(find . -maxdepth 1 ! -name "include" ! -name "lib" ! -name "cmake" ! -name "utils" ! -name ".")
233233
cd ../clang/
234234
rm -rf $(find . -maxdepth 1 ! -name "include" ! -name "lib" ! -name "cmake" ! -name "utils" ! -name ".")
235-
cd ../..
235+
cd ../../cling/
236+
rm -rf $(find . -maxdepth 1 ! -name "include" ! -name "lib" ! -name "cmake" ! -name ".")
236237
else # repl
237238
cd ./llvm/
238239
rm -rf $(find . -maxdepth 1 ! -name "include" ! -name "lib" ! -name "cmake" ! -name ".")
@@ -301,7 +302,7 @@ jobs:
301302
with:
302303
fetch-depth: 0
303304

304-
- name: Set up Python
305+
- name: Set up Python
305306
uses: actions/setup-python@v5
306307
with:
307308
python-version: '3.11'
@@ -341,7 +342,7 @@ jobs:
341342
echo "CXX=g++-${vers}" >> $GITHUB_ENV
342343
else
343344
cling_on=$(echo "${{ matrix.cling }}" | tr '[:lower:]' '[:upper:]')
344-
if [[ "${cling_on}" == "ON" ]]; then
345+
if [[ "${cling_on}" == "ON" ]]; then
345346
brew install llvm@15
346347
brew remove llvm@18
347348
brew cleanup
@@ -364,19 +365,19 @@ jobs:
364365

365366
- name: Install deps
366367
run: |
367-
brew update --force
368+
brew update --force
368369
brew remove unxip
369370
# workaround for https://github.com/actions/setup-python/issues/577
370371
for pkg in $(brew list | grep '^python@'); do
371372
brew unlink "$pkg"
372373
brew link --overwrite "$pkg"
373374
done
374-
brew upgrade --force
375+
brew upgrade --force
375376
brew install eigen
376377
brew install boost
377378
brew install gnu-sed
378379
pip install distro pytest
379-
380+
380381
381382
- name: Restore Cache LLVM/Clang runtime build directory
382383
uses: actions/cache/restore@v4
@@ -455,7 +456,7 @@ jobs:
455456
cmake --build . --parallel ${{ env.ncpus }}
456457
cp libcppyy-backend.dylib $CPPINTEROP_DIR/lib/
457458
cd ..
458-
459+
459460
- name: Install CPyCppyy
460461
if: ${{ matrix.cppyy == 'On' }}
461462
run: |
@@ -542,7 +543,7 @@ jobs:
542543
tail -n1 test_xfailed.log
543544
echo "Return Code: ${RETCODE}"
544545
exit $RETCODE
545-
546+
546547
- name: Show debug info
547548
if: ${{ failure() }}
548549
run: |

‎.github/workflows/MacOS.yml‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ jobs:
6565
cling-version: '1.0'
6666
llvm_enable_projects: "clang"
6767
llvm_targets_to_build: "host;NVPTX"
68-
68+
6969
steps:
7070
- uses: actions/checkout@v4
7171
with:
7272
fetch-depth: 0
7373

74-
- name: Set up Python
74+
- name: Set up Python
7575
uses: actions/setup-python@v5
7676
with:
7777
python-version: '3.11'
@@ -94,7 +94,7 @@ jobs:
9494
fi
9595
9696
echo "CLING_HASH=$CLING_HASH" >> $GITHUB_ENV
97-
echo "LLVM_HASH=$LLVM_HASH" >> $GITHUB_ENV
97+
echo "LLVM_HASH=$LLVM_HASH" >> $GITHUB_ENV
9898
9999
- name: Restore Cache LLVM/Clang runtime build directory
100100
uses: actions/cache/restore@v4
@@ -138,7 +138,7 @@ jobs:
138138
brew unlink "$pkg"
139139
brew link --overwrite "$pkg"
140140
done
141-
brew upgrade openssl >/dev/null 2>&1
141+
brew upgrade openssl >/dev/null 2>&1
142142
brew upgrade
143143
brew install ninja
144144
@@ -148,7 +148,7 @@ jobs:
148148
cling_on=$(echo "${{ matrix.cling }}" | tr '[:lower:]' '[:upper:]')
149149
if [[ "${cling_on}" == "ON" ]]; then
150150
git clone https://github.com/root-project/cling.git
151-
cd ./cling
151+
cd ./cling
152152
git checkout tags/v${{ matrix.cling-version }}
153153
cd ..
154154
git clone --depth=1 -b cling-llvm${{ matrix.clang-runtime }} https://github.com/root-project/llvm-project.git
@@ -216,7 +216,8 @@ jobs:
216216
rm -rf $(find . -maxdepth 1 ! -name "include" ! -name "lib" ! -name "cmake" ! -name "utils" ! -name ".")
217217
cd ../clang/
218218
rm -rf $(find . -maxdepth 1 ! -name "include" ! -name "lib" ! -name "cmake" ! -name "utils" ! -name ".")
219-
cd ../..
219+
cd ../../cling/
220+
rm -rf $(find . -maxdepth 1 ! -name "include" ! -name "lib" ! -name "cmake" ! -name ".")
220221
else # repl
221222
cd ./llvm/
222223
rm -rf $(find . -maxdepth 1 ! -name "include" ! -name "lib" ! -name "cmake" ! -name ".")
@@ -285,7 +286,7 @@ jobs:
285286
with:
286287
fetch-depth: 0
287288

288-
- name: Set up Python
289+
- name: Set up Python
289290
uses: actions/setup-python@v5
290291
with:
291292
python-version: '3.11'
@@ -333,19 +334,19 @@ jobs:
333334

334335
- name: Install deps
335336
run: |
336-
brew update --force
337+
brew update --force
337338
brew remove swiftlint
338339
# workaround for https://github.com/actions/setup-python/issues/577
339340
for pkg in $(brew list | grep '^python@'); do
340341
brew unlink "$pkg"
341342
brew link --overwrite "$pkg"
342343
done
343-
brew upgrade --force
344+
brew upgrade --force
344345
brew install eigen
345346
brew install boost
346347
brew install gnu-sed
347348
pip install distro pytest
348-
349+
349350
350351
- name: Restore Cache LLVM/Clang runtime build directory
351352
uses: actions/cache/restore@v4
@@ -424,7 +425,7 @@ jobs:
424425
cmake --build . --parallel ${{ env.ncpus }}
425426
cp libcppyy-backend.dylib $CPPINTEROP_DIR/lib/
426427
cd ..
427-
428+
428429
- name: Install CPyCppyy
429430
if: ${{ matrix.cppyy == 'On' }}
430431
run: |
@@ -511,7 +512,7 @@ jobs:
511512
tail -n1 test_xfailed.log
512513
echo "Return Code: ${RETCODE}"
513514
exit $RETCODE
514-
515+
515516
- name: Show debug info
516517
if: ${{ failure() }}
517518
run: |

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,13 @@ jobs:
108108
cling-version: '1.0'
109109
llvm_enable_projects: "clang"
110110
llvm_targets_to_build: "host;NVPTX"
111-
111+
112112
steps:
113113
- uses: actions/checkout@v4
114114
with:
115115
fetch-depth: 0
116116

117-
- name: Set up Python
117+
- name: Set up Python
118118
uses: actions/setup-python@v5
119119
with:
120120
python-version: '3.11'
@@ -137,7 +137,7 @@ jobs:
137137
fi
138138
139139
echo "CLING_HASH=$CLING_HASH" >> $GITHUB_ENV
140-
echo "LLVM_HASH=$LLVM_HASH" >> $GITHUB_ENV
140+
echo "LLVM_HASH=$LLVM_HASH" >> $GITHUB_ENV
141141
142142
- name: Restore Cache LLVM/Clang runtime build directory
143143
uses: actions/cache/restore@v4
@@ -195,7 +195,7 @@ jobs:
195195
cling_on=$(echo "${{ matrix.cling }}" | tr '[:lower:]' '[:upper:]')
196196
if [[ "${cling_on}" == "ON" ]]; then
197197
git clone https://github.com/root-project/cling.git
198-
cd ./cling
198+
cd ./cling
199199
git checkout tags/v${{ matrix.cling-version }}
200200
cd ..
201201
git clone --depth=1 -b cling-llvm${{ matrix.clang-runtime }} https://github.com/root-project/llvm-project.git
@@ -263,7 +263,8 @@ jobs:
263263
rm -rf $(find . -maxdepth 1 ! -name "include" ! -name "lib" ! -name "cmake" ! -name "utils" ! -name ".")
264264
cd ../clang/
265265
rm -rf $(find . -maxdepth 1 ! -name "include" ! -name "lib" ! -name "cmake" ! -name "utils" ! -name ".")
266-
cd ../..
266+
cd ../../cling/
267+
rm -rf $(find . -maxdepth 1 ! -name "include" ! -name "lib" ! -name "cmake" ! -name ".")
267268
else # repl
268269
cd ./llvm/
269270
rm -rf $(find . -maxdepth 1 ! -name "include" ! -name "lib" ! -name "cmake" ! -name ".")
@@ -369,7 +370,7 @@ jobs:
369370
with:
370371
fetch-depth: 0
371372

372-
- name: Set up Python
373+
- name: Set up Python
373374
uses: actions/setup-python@v5
374375
with:
375376
python-version: '3.11'
@@ -435,7 +436,7 @@ jobs:
435436
# Install libraries used by the cppyy test suite
436437
sudo apt install libeigen3-dev
437438
sudo apt install libboost-all-dev
438-
439+
439440
440441
- name: Restore Cache LLVM/Clang runtime build directory
441442
uses: actions/cache/restore@v4
@@ -548,7 +549,7 @@ jobs:
548549
cmake --build . --parallel ${{ env.ncpus }}
549550
cp libcppyy-backend.so $CPPINTEROP_DIR/lib/
550551
cd ..
551-
552+
552553
- name: Install CPyCppyy
553554
if: ${{ matrix.cppyy == 'On' }}
554555
run: |
@@ -622,7 +623,7 @@ jobs:
622623
declare -i RETCODE=0
623624
624625
set -o pipefail
625-
626+
626627
echo "Running valgrind on passing tests"
627628
CLANG_VERSION="${{ matrix.clang-runtime }}"
628629
SUPPRESSION_FILE="../etc/clang${CLANG_VERSION}-valgrind_arm.supp"
@@ -640,7 +641,7 @@ jobs:
640641
tail -n1 test_xfailed.log
641642
echo "Return Code: ${RETCODE}"
642643
exit $RETCODE
643-
644+
644645
- name: Show debug info
645646
if: ${{ failure() }}
646647
run: |

0 commit comments

Comments
 (0)