Skip to content

Commit a42d2ce

Browse files
committed
[ci] Enable gnuinstall in the march=native build
This is to test that ROOT doesn't get confused at build and test time by the fact that the structure of the install tree and build tree is different, which is the case for `gnuinstall=ON`.
1 parent d0566ab commit a42d2ce

2 files changed

Lines changed: 11 additions & 5 deletions

File tree

.github/workflows/root-ci-config/buildconfig/opensuse15-march_native.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
CMAKE_CXX_FLAGS=-march=native
2-
CMAKE_C_FLAGS=-march=native
32
CMAKE_CXX_STANDARD=20
3+
CMAKE_C_FLAGS=-march=native
4+
builtin_nlohmannjson=ON
45
builtin_tbb=ON
6+
builtin_unuran=ON
57
builtin_vdt=ON
68
builtin_xrootd=ON
7-
builtin_unuran=ON
8-
builtin_nlohmannjson=ON
9+
gnuinstall=ON
10+
pythia8=OFF
11+
r=OFF
912
test_distrdf_dask=OFF
1013
test_distrdf_pyspark=OFF
1114
tmva-pymva=ON
1215
tmva-sofie=ON
13-
pythia8=OFF
14-
r=OFF

.github/workflows/root-ci.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,11 @@ jobs:
130130
- platform: mac-beta
131131
is_special: true
132132
arch: ARM64
133+
# For the PR and incremental builds, we set gnuinstall=ON to check
134+
# if CMake can deal with the different structure of the install and
135+
# build tree at build and test time. We don't care how the install
136+
# actually looks like.
137+
overrides: ["gnuinstall=ON"]
133138

134139
runs-on:
135140
- self-hosted

0 commit comments

Comments
 (0)