From 3baa9cce7c65ca60cbf9cea57f2993ff41ed14bb Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Mon, 21 Oct 2024 10:53:11 +0200 Subject: [PATCH 1/5] CI: try brew install for macOS --- .github/workflows/mac.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/mac.yml diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml new file mode 100644 index 000000000..1f1796789 --- /dev/null +++ b/.github/workflows/mac.yml @@ -0,0 +1,29 @@ +name: macOS + +on: [push, pull_request] + +jobs: + macOS: + runs-on: macos-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Brew install + run: | + brew install root boost cmake ninja + - name: Compile + run: | + mkdir build + cd build + cmake -GNinja -DDD4HEP_USE_GEANT4=OFF -DBoost_NO_BOOST_CMAKE=ON -DDD4HEP_USE_LCIO=OFF -DBUILD_TESTING=ON -DDD4HEP_USE_XERCESC=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=20 .. + ninja + ninja install + . ../bin/thisdd4hep.sh + ctest --output-on-failure -j4 + cd ../examples/ + mkdir build + cd build + cmake -GNinja -DBoost_NO_BOOST_CMAKE=ON -DDD4HEP_USE_XERCESC=OFF -DCMAKE_CXX_STANDARD=20 .. + ninja + ninja install + ctest --output-on-failure -E t_ClientTests_Check_Shape_Eightpoint_Reflect_DetElement From 61aec2a4dc52c647cc91be0ad66837beea1067d7 Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Mon, 21 Oct 2024 11:03:12 +0200 Subject: [PATCH 2/5] CI: macOS, relax pyver because we do not control enough of the brew eco system --- .github/workflows/mac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 1f1796789..871f80919 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -15,7 +15,7 @@ jobs: run: | mkdir build cd build - cmake -GNinja -DDD4HEP_USE_GEANT4=OFF -DBoost_NO_BOOST_CMAKE=ON -DDD4HEP_USE_LCIO=OFF -DBUILD_TESTING=ON -DDD4HEP_USE_XERCESC=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=20 .. + cmake -GNinja -DDD4HEP_USE_GEANT4=OFF -DBoost_NO_BOOST_CMAKE=ON -DDD4HEP_USE_LCIO=OFF -DBUILD_TESTING=ON -DDD4HEP_USE_XERCESC=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=20 -DDD4HEP_RELAX_PYVER=ON .. ninja ninja install . ../bin/thisdd4hep.sh From 064f6b27e60b24ff357975fa15ba4fe52a358e95 Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Mon, 21 Oct 2024 11:06:41 +0200 Subject: [PATCH 3/5] CI: macOS: this ROOT is c++17 --- .github/workflows/mac.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 871f80919..27162254d 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -15,7 +15,7 @@ jobs: run: | mkdir build cd build - cmake -GNinja -DDD4HEP_USE_GEANT4=OFF -DBoost_NO_BOOST_CMAKE=ON -DDD4HEP_USE_LCIO=OFF -DBUILD_TESTING=ON -DDD4HEP_USE_XERCESC=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=20 -DDD4HEP_RELAX_PYVER=ON .. + cmake -GNinja -DDD4HEP_USE_GEANT4=OFF -DBoost_NO_BOOST_CMAKE=ON -DDD4HEP_USE_LCIO=OFF -DBUILD_TESTING=ON -DDD4HEP_USE_XERCESC=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=17 -DDD4HEP_RELAX_PYVER=ON .. ninja ninja install . ../bin/thisdd4hep.sh @@ -23,7 +23,7 @@ jobs: cd ../examples/ mkdir build cd build - cmake -GNinja -DBoost_NO_BOOST_CMAKE=ON -DDD4HEP_USE_XERCESC=OFF -DCMAKE_CXX_STANDARD=20 .. + cmake -GNinja -DBoost_NO_BOOST_CMAKE=ON -DDD4HEP_USE_XERCESC=OFF -DCMAKE_CXX_STANDARD=17 .. ninja ninja install ctest --output-on-failure -E t_ClientTests_Check_Shape_Eightpoint_Reflect_DetElement From dfa5c8018c50c11aaeb141f387b20959369f1691 Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Mon, 21 Oct 2024 13:04:18 +0200 Subject: [PATCH 4/5] CI: macOS install pytest for testing --- .github/workflows/mac.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 27162254d..aaea4d160 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -11,6 +11,7 @@ jobs: - name: Brew install run: | brew install root boost cmake ninja + pip install pytest - name: Compile run: | mkdir build From 8db2ccb1f100ee8f5ad8ac1de0285d18465b3de2 Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Mon, 21 Oct 2024 13:26:57 +0200 Subject: [PATCH 5/5] CI: macos: remove running tests as most of them don't really work --- .github/workflows/mac.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index aaea4d160..61cc1a10b 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -18,13 +18,3 @@ jobs: cd build cmake -GNinja -DDD4HEP_USE_GEANT4=OFF -DBoost_NO_BOOST_CMAKE=ON -DDD4HEP_USE_LCIO=OFF -DBUILD_TESTING=ON -DDD4HEP_USE_XERCESC=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=17 -DDD4HEP_RELAX_PYVER=ON .. ninja - ninja install - . ../bin/thisdd4hep.sh - ctest --output-on-failure -j4 - cd ../examples/ - mkdir build - cd build - cmake -GNinja -DBoost_NO_BOOST_CMAKE=ON -DDD4HEP_USE_XERCESC=OFF -DCMAKE_CXX_STANDARD=17 .. - ninja - ninja install - ctest --output-on-failure -E t_ClientTests_Check_Shape_Eightpoint_Reflect_DetElement