diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index 183db2d2f4e..6eaefd8b01a 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -21,7 +21,7 @@ env: jobs: build_debug: runs-on: ubuntu-latest - container: ghcr.io/acts-project/ubuntu2004:v26 + container: ghcr.io/acts-project/ubuntu2004:v28 steps: - uses: actions/checkout@v3 @@ -63,7 +63,7 @@ jobs: build_performance: runs-on: ubuntu-latest - container: ghcr.io/acts-project/ubuntu2004:v26 + container: ghcr.io/acts-project/ubuntu2004:v28 if: github.ref == 'refs/heads/main' steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index d37d2321b6d..a6805749aed 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -17,7 +17,7 @@ env: jobs: lcg: runs-on: ubuntu-latest - container: ghcr.io/acts-project/${{ matrix.image }}:v26 + container: ghcr.io/acts-project/${{ matrix.image }}:v28 strategy: matrix: image: @@ -93,7 +93,7 @@ jobs: linux_ubuntu: runs-on: ubuntu-latest - container: ghcr.io/acts-project/ubuntu2004:v26 + container: ghcr.io/acts-project/ubuntu2004:v28 env: INSTALL_DIR: ${{ github.workspace }}/install ACTS_LOG_FAILURE_THRESHOLD: WARNING @@ -171,7 +171,7 @@ jobs: linux_examples_test: runs-on: ubuntu-latest - container: ghcr.io/acts-project/ubuntu2004:v26 + container: ghcr.io/acts-project/ubuntu2004:v28 needs: [linux_ubuntu] steps: - name: Install git lfs @@ -208,7 +208,7 @@ jobs: linux_physmon: runs-on: ubuntu-latest - container: ghcr.io/acts-project/ubuntu2004:v26 + container: ghcr.io/acts-project/ubuntu2004:v28 needs: [linux_ubuntu] steps: @@ -249,6 +249,82 @@ jobs: name: physmon path: physmon + linux_ubuntu_extra: + runs-on: ubuntu-latest + strategy: + matrix: + image: + - ubuntu2204 + - ubuntu2204_clang + container: ghcr.io/acts-project/${{ matrix.image }}:v28 + env: + INSTALL_DIR: ${{ github.workspace }}/install + ACTS_LOG_FAILURE_THRESHOLD: WARNING + steps: + - name: Install git lfs + run: apt-get install -y git-lfs + + - uses: actions/checkout@v3 + with: + submodules: true + lfs: true + + - name: Cache build + uses: actions/cache@v3 + with: + path: ${{ github.workspace }}/ccache + key: ${{ runner.os }}-ccache-linux_ubuntu_extra_${{ env.CCACHE_KEY_SUFFIX }}_${{ github.sha }} + restore-keys: | + ${{ runner.os }}-ccache-linux_ubuntu_extra_${{ env.CCACHE_KEY_SUFFIX }}_ + + + - name: Configure + # setting CMAKE_CXX_STANDARD=17 is a workaround for a bug in the + # dd4hep CMake configuration that gets triggered on recent CMake + # versions + run: > + cmake -B build -S . + -GNinja + -DCMAKE_CXX_COMPILER_LAUNCHER=ccache + -DCMAKE_BUILD_TYPE=Release + -DCMAKE_CXX_FLAGS=-Werror + -DCMAKE_CXX_STANDARD=17 + -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" + -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON + -DACTS_BUILD_EVERYTHING=ON + -DACTS_BUILD_ODD=ON + -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON + -DACTS_BUILD_EXAMPLES_EDM4HEP=ON + -DACTS_FORCE_ASSERTIONS=ON + -DACTS_BUILD_ANALYSIS_APPS=ON + + - name: Build + run: cmake --build build -- + + - name: Unit tests + run: cmake --build build -- test + + - name: Integration tests + run: cmake --build build -- integrationtests + + - name: Install + run: cmake --build build -- install + + - name: Downstream configure + run: > + cmake -B build-downstream -S Tests/DownstreamProject + -GNinja + -DCMAKE_BUILD_TYPE=Release + -DCMAKE_CXX_FLAGS=-Werror + -DCMAKE_CXX_STANDARD=17 + -DCMAKE_PREFIX_PATH="${INSTALL_DIR}" + + - name: Downstream build + run: cmake --build build-downstream -- + + - name: Downstream run + run: ./build-downstream/bin/ShowActsVersion + linux-nodeps: runs-on: ubuntu-latest container: ghcr.io/acts-project/${{ matrix.image }}:latest @@ -415,7 +491,7 @@ jobs: cuda: runs-on: ubuntu-latest - container: ghcr.io/acts-project/ubuntu1804_cuda:v26 + container: ghcr.io/acts-project/ubuntu1804_cuda:v28 steps: - uses: actions/checkout@v2 @@ -442,7 +518,7 @@ jobs: exatrkx: runs-on: ubuntu-latest - container: ghcr.io/acts-project/ubuntu2004_exatrkx:v26 + container: ghcr.io/acts-project/ubuntu2004_exatrkx:v28 steps: - uses: actions/checkout@v2 @@ -469,7 +545,7 @@ jobs: sycl: runs-on: ubuntu-latest - container: ghcr.io/acts-project/ubuntu2004_oneapi:v26 + container: ghcr.io/acts-project/ubuntu2004_oneapi:v28 defaults: run: shell: bash @@ -503,7 +579,7 @@ jobs: docs: runs-on: ubuntu-latest - container: ghcr.io/acts-project/ubuntu2004:v26 + container: ghcr.io/acts-project/ubuntu2004:v28 env: DOXYGEN_WARN_AS_ERROR: YES steps: diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index eadf64ab50c..74b92f57af9 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -10,7 +10,7 @@ on: jobs: format: runs-on: ubuntu-latest - container: ghcr.io/acts-project/format10:v26 + container: ghcr.io/acts-project/format10:v28 steps: - uses: actions/checkout@v3 - name: Check diff --git a/Examples/Python/tests/requirements.in b/Examples/Python/tests/requirements.in index 5080ed06e65..06a308ae561 100644 --- a/Examples/Python/tests/requirements.in +++ b/Examples/Python/tests/requirements.in @@ -2,3 +2,4 @@ pytest pytest-check uproot awkward +pytest-rerunfailures diff --git a/Examples/Python/tests/requirements.txt b/Examples/Python/tests/requirements.txt index db65c8fdb05..c9b74234224 100644 --- a/Examples/Python/tests/requirements.txt +++ b/Examples/Python/tests/requirements.txt @@ -26,8 +26,11 @@ pytest==7.0.1 # via # -r requirements.in # pytest-check + # pytest-rerunfailures pytest-check==1.0.4 # via -r requirements.in +pytest-rerunfailures==10.2 + # via -r requirements.in tomli==2.0.1 # via pytest uproot==4.1.9 diff --git a/Examples/Python/tests/test_examples.py b/Examples/Python/tests/test_examples.py index 6f43a28adc7..f3d603fd7eb 100644 --- a/Examples/Python/tests/test_examples.py +++ b/Examples/Python/tests/test_examples.py @@ -935,6 +935,7 @@ def test_vertex_fitting(tmp_path): ], ) @pytest.mark.filterwarnings("ignore::UserWarning") +@pytest.mark.flaky(reruns=2) def test_vertex_fitting_reading( tmp_path, ptcl_gun, rng, finder, inputTracks, entries, assert_root_hash ): diff --git a/thirdparty/OpenDataDetector b/thirdparty/OpenDataDetector index 05f456b791d..93277c38f93 160000 --- a/thirdparty/OpenDataDetector +++ b/thirdparty/OpenDataDetector @@ -1 +1 @@ -Subproject commit 05f456b791d66da67be9d906b2509db714691b30 +Subproject commit 93277c38f931c7596515f6e667866e65d91ddc6e diff --git a/thirdparty/actsdd4hep/CMakeLists.txt b/thirdparty/actsdd4hep/CMakeLists.txt index b97e3981fb2..fd79b2e15d1 100644 --- a/thirdparty/actsdd4hep/CMakeLists.txt +++ b/thirdparty/actsdd4hep/CMakeLists.txt @@ -8,7 +8,7 @@ message( STATUS "Building ActsDD4hep glue library as part of the ACTS project" ) # Declare where to get VecMem from. set( ACTS_ACTSDD4HEP_GIT_REPOSITORY "https://github.com/acts-project/acts-dd4hep.git" CACHE STRING "Git repository to take ActsDD4hep glue library from from" ) -set( ACTS_ACTSDD4HEP_GIT_TAG "v1.0.0" CACHE STRING "Version of ActsDD4hep glue library to build" ) +set( ACTS_ACTSDD4HEP_GIT_TAG "v1.0.1" CACHE STRING "Version of ActsDD4hep glue library to build" ) mark_as_advanced( ACTS_ACTSDD4HEP_GIT_REPOSITORY ACTS_ACTSDD4HEP_GIT_TAG ) FetchContent_Declare( actsdd4hep GIT_REPOSITORY "${ACTS_ACTSDD4HEP_GIT_REPOSITORY}"