Skip to content

Commit e8723d6

Browse files
committed
fixup! Add separate Cling Test CI
1 parent f75a6ce commit e8723d6

File tree

2 files changed

+21
-14
lines changed

2 files changed

+21
-14
lines changed

.github/workflows/cling-test.yml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,20 @@ jobs:
5454
- name: Pull Request Build
5555
env:
5656
INCREMENTAL: ${{ !contains(github.event.pull_request.labels.*.name, 'clean build') }}
57-
run: |
58-
.github/workflows/root-ci-config/build_root.py \
59-
--buildtype RelWithDebInfo \
60-
--platform alma9 \
61-
--dockeropts \"\$CONTAINER_OPTIONS\" \
62-
--incremental $INCREMENTAL \
63-
--base_ref ${{ github.base_ref }} \
64-
--sha ${{ github.sha }} \
65-
--pull_repository ${{ github.event.pull_request.head.repo.clone_url }} \
66-
--head_ref refs/pull/${{ github.event.pull_request.number }}/head:${{ github.event.pull_request.head.ref }} \
67-
--head_sha ${{ github.event.pull_request.head.sha }} \
68-
--repository ${{ github.server_url }}/${{ github.repository }} \
57+
run: ".github/workflows/root-ci-config/build_root.py
58+
--buildtype RelWithDebInfo
59+
--platform alma9
60+
--dockeropts \"$CONTAINER_OPTIONS\"
61+
--incremental $INCREMENTAL
62+
--base_ref ${{ github.base_ref }}
63+
--sha ${{ github.sha }}
64+
--pull_repository ${{ github.event.pull_request.head.repo.clone_url }}
65+
--head_ref refs/pull/${{ github.event.pull_request.number }}/head:${{ github.event.pull_request.head.ref }}
66+
--head_sha ${{ github.event.pull_request.head.sha }}
67+
--repository ${{ github.server_url }}/${{ github.repository }}
6968
--clingtests_only true
69+
"
70+
71+
- name: ccache info (post)
72+
run: |
73+
ccache -s || true

.github/workflows/root-ci-config/build_root.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ def main():
7777
**load_config(f'{this_script_dir}/buildconfig/{args.platform}.txt')
7878
}
7979

80+
if args.clingtests_only:
81+
options_dict['clingtest'] = "ON"
82+
8083
options = build_utils.cmake_options_from_dict(options_dict)
8184

8285
if WINDOWS:
@@ -124,7 +127,7 @@ def main():
124127

125128
testing: bool = options_dict['testing'].lower() == "on" and options_dict['roottest'].lower() == "on"
126129

127-
if testing:
130+
if testing and not args.clingtests_only:
128131
# Where to put the roottest directory
129132
if os.path.exists(os.path.join(WORKDIR, "src", "roottest", ".git")):
130133
roottest_dir = "src/roottest"
@@ -168,7 +171,7 @@ def main():
168171
if args.coverage:
169172
create_coverage_xml()
170173

171-
if testing and ctest_returncode != 0:
174+
if testing and not args.clingtests_only and ctest_returncode != 0:
172175
handle_test_failure(ctest_returncode)
173176

174177
print_trace()

0 commit comments

Comments
 (0)