Skip to content

Commit 7c059db

Browse files
try to restructure CMakeLists
1 parent 2bf0ce4 commit 7c059db

1 file changed

Lines changed: 9 additions & 8 deletions

File tree

.github/workflows/cmake.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,20 @@ permissions:
1515
contents: read # This is required for actions/checkout@v2
1616

1717
jobs:
18-
build_centos7:
19-
container: kreisl/rootcpp17
18+
build_fedora34:
19+
container: rootproject/root:6.22.08-fedora34
2020
runs-on: ubuntu-latest
2121
steps:
2222
- uses: actions/checkout@v2
2323
with:
2424
fetch-depth: 0
2525
- name: Configure CMake
26-
run: source /opt/rh/devtoolset-8/enable && cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DAnalysisTreeQA_BUILD_TESTS=ON -DAnalysisTreeQA_BUNDLED_AT=ON
26+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DAnalysisTreeQA_BUILD_TESTS=ON -DAnalysisTreeQA_BUNDLED_AT=ON
2727
- name: Build
2828
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
2929
- name: Test
3030
run: cd ${{github.workspace}}/build && ctest -C ${{env.BUILD_TYPE}}
31+
3132
# build_fedora35:
3233
# container: rootproject/root:6.24.06-fedora35
3334
# runs-on: ubuntu-latest
@@ -42,18 +43,18 @@ jobs:
4243
# - name: Test
4344
# run: cd ${{github.workspace}}/build && ctest -C ${{env.BUILD_TYPE}}
4445
#
45-
# build_fedora34:
46-
# container: rootproject/root:6.22.08-fedora34
46+
47+
48+
# build_centos7:
49+
# container: kreisl/rootcpp17
4750
# runs-on: ubuntu-latest
4851
# steps:
4952
# - uses: actions/checkout@v2
5053
# with:
5154
# fetch-depth: 0
5255
# - name: Configure CMake
53-
# run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DAnalysisTreeQA_BUILD_TESTS=ON -DAnalysisTreeQA_BUNDLED_AT=ON
56+
# run: source /opt/rh/devtoolset-8/enable && cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DAnalysisTreeQA_BUILD_TESTS=ON -DAnalysisTreeQA_BUNDLED_AT=ON
5457
# - name: Build
5558
# run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
5659
# - name: Test
5760
# run: cd ${{github.workspace}}/build && ctest -C ${{env.BUILD_TYPE}}
58-
59-

0 commit comments

Comments
 (0)