Merge branch 'main' into refactor-constrainedstep-strongenum+cap

acts-project · Jan 15, 2025 · 95243ec · 95243ec
2 parents bcc000e + e7a1388
commit 95243ec
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 16 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ variables:
 
 clang_tidy:
   stage: build
-  image: ghcr.io/acts-project/ubuntu2404:63
+  image: registry.cern.ch/ghcr.io/acts-project/ubuntu2404:63
   tags:
     - large
   artifacts:
@@ -71,7 +71,7 @@ clang_tidy:
 
 build_exatrkx_cpu:
   stage: build
-  image: ghcr.io/acts-project/ubuntu2204_exatrkx:63
+  image: registry.cern.ch/ghcr.io/acts-project/ubuntu2204_exatrkx:63
   variables:
     DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.$DEPENDENCY_TAG.tar.zst
   tags:
@@ -104,7 +104,7 @@ build_exatrkx_cpu:
 
 build_exatrkx:
   stage: build
-  image: ghcr.io/acts-project/ubuntu2204_exatrkx:63
+  image: registry.cern.ch/ghcr.io/acts-project/ubuntu2204_exatrkx:63
   variables:
     DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.$DEPENDENCY_TAG.tar.zst
   tags:
@@ -146,7 +146,7 @@ test_exatrkx_unittests:
   stage: test
   needs:
     - build_exatrkx
-  image: ghcr.io/acts-project/ubuntu2204_exatrkx:63
+  image: registry.cern.ch/ghcr.io/acts-project/ubuntu2204_exatrkx:63
   variables:
     DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.$DEPENDENCY_TAG.tar.zst
   tags:
@@ -165,7 +165,7 @@ test_exatrkx_python:
   stage: test
   needs:
     - build_exatrkx
-  image: ghcr.io/acts-project/ubuntu2204_exatrkx:63
+  image: registry.cern.ch/ghcr.io/acts-project/ubuntu2204_exatrkx:63
   variables:
     DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.$DEPENDENCY_TAG.tar.zst
   tags:
@@ -188,7 +188,7 @@ test_exatrkx_python:
 
 build_linux_ubuntu:
   stage: build
-  image: ghcr.io/acts-project/ubuntu2404:63
+  image: registry.cern.ch/ghcr.io/acts-project/ubuntu2404:63
   variables:
     DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.$DEPENDENCY_TAG.tar.zst
 
@@ -226,9 +226,29 @@ build_linux_ubuntu:
     - cmake --build build -- -j6
     - ccache -s
 
+    - ctest --test-dir build -j$(nproc)
+    - cmake --build build --target integrationtests
+
+    # Install main project
+    - cmake --install build
+
+    # Downstream configure
+    - >
+      cmake -B build-downstream -S src/Tests/DownstreamProject
+      -GNinja
+      -DCMAKE_BUILD_TYPE=Release
+      -DCMAKE_CXX_FLAGS=-Werror
+      -DCMAKE_PREFIX_PATH="${INSTALL_DIR}"
+
+    # Downstream build
+    - cmake --build build-downstream
+
+    # Downstream run
+    - ./build-downstream/bin/ShowActsVersion
+
 linux_test_examples:
   stage: test
-  image: ghcr.io/acts-project/ubuntu2404:63
+  image: registry.cern.ch/ghcr.io/acts-project/ubuntu2404:63
   variables:
     DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.$DEPENDENCY_TAG.tar.zst
   needs: [build_linux_ubuntu]
@@ -252,7 +272,7 @@ linux_test_examples:
 
 linux_physmon:
   stage: test
-  image: ghcr.io/acts-project/ubuntu2404:63
+  image: registry.cern.ch/ghcr.io/acts-project/ubuntu2404:63
   variables:
     DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.$DEPENDENCY_TAG.tar.zst
   needs: [build_linux_ubuntu]
@@ -347,22 +367,22 @@ linux_ubuntu_2204:
   variables:
     CXXSTD: 20
     DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.$DEPENDENCY_TAG.tar.zst
-  image: ghcr.io/acts-project/ubuntu2204:63
+  image: registry.cern.ch/ghcr.io/acts-project/ubuntu2204:63
 
 linux_ubuntu_2204_clang:
   extends: .linux_ubuntu_extra
   variables:
     CXXSTD: 20
     DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.$DEPENDENCY_TAG.tar.zst
-  image: ghcr.io/acts-project/ubuntu2204_clang:63
+  image: registry.cern.ch/ghcr.io/acts-project/ubuntu2204_clang:63
 
 
 ######################
 ### LCG JOB MATRIX ###
 ######################
 
 .lcg_base_job:
-  image: ghcr.io/acts-project/${OS}-base:63
+  image: registry.cern.ch/ghcr.io/acts-project/${OS}-base:63
   stage: build
   tags:
     - cvmfs

diff --git a/Core/src/Geometry/TrackingVolume.cpp b/Core/src/Geometry/TrackingVolume.cpp
@@ -746,6 +746,10 @@ void TrackingVolume::visualize(IVisualization3D& helper,
     surface.visualize(helper, gctx, sensitiveViewConfig);
   }
 
+  for (const auto& portal : portals()) {
+    portal.surface().visualize(helper, gctx, portalViewConfig);
+  }
+
   for (const auto& child : volumes()) {
     child.visualize(helper, gctx, viewConfig, portalViewConfig,
                     sensitiveViewConfig);

diff --git a/Examples/Python/CMakeLists.txt b/Examples/Python/CMakeLists.txt
@@ -268,9 +268,11 @@ foreach(f ${py_files})
         CREATE_LINK ${CMAKE_CURRENT_SOURCE_DIR}/python/acts/${f} ${_target}
         SYMBOLIC
     )
-endforeach()
 
-install(
-    DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/python/acts/
-    DESTINATION ${_python_install_dir}
-)
+    get_filename_component(_rel ${f} DIRECTORY)
+
+    install(
+        FILES ${CMAKE_CURRENT_SOURCE_DIR}/python/acts/${f}
+        DESTINATION ${_python_install_dir}/${_rel}
+    )
+endforeach()