Merge branch 'acts-project:main' into xtrmly-public

.gitlab-ci.yml

@@ -81,7 +81,7 @@ build_exatrkx_cpu:
       -DACTS_EXATRKX_ENABLE_CUDA=OFF
 
     - ccache -z
-    - cmake --build build -- -j8
+    - cmake --build build -- -j6
     - ccache -s
 
 build_exatrkx:
@@ -119,7 +119,7 @@ build_exatrkx:
       -DCMAKE_CUDA_ARCHITECTURES="75;86"
 
     - ccache -z
-    - cmake --build build -- -j8
+    - cmake --build build -- -j6
     - ccache -s
 
 # test_exatrkx_unittests:
@@ -186,7 +186,7 @@ build_linux_ubuntu:
       -DACTS_BUILD_PLUGIN_ONNX=ON
 
     - ccache -z
-    - cmake --build build -- -j8
+    - cmake --build build -- -j6
     - ccache -s
 
 linux_test_examples:
@@ -271,7 +271,7 @@ linux_physmon:
       -DCMAKE_CXX_STANDARD=${CXXSTD}
 
     - ccache -z
-    - cmake --build build -- -j8
+    - cmake --build build -- -j6
     - ccache -s
 
     - ctest --test-dir build -j$(nproc)
@@ -367,7 +367,7 @@ linux_ubuntu_2204_clang:
       -DACTS_BUILD_PLUGIN_GEOMODEL=OFF # GeoModel is not in LCG at this point
 
     - ccache -z
-    - cmake --build build -- -j8
+    - cmake --build build -- -j6
     - ccache -s
 
     - ctest --test-dir build -j$(nproc)

.merge-sentinel.yml

@@ -14,6 +14,7 @@ rules:
     required_checks:
      - Docs / docs
      - Analysis / build_debug
+     - SonarCloud Code Analysis
 
     required_pattern:
      - "Builds / *"

Alignment/include/ActsAlignment/Kernel/Alignment.hpp

@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 

Alignment/include/ActsAlignment/Kernel/Alignment.ipp

@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/EventData/VectorMultiTrajectory.hpp"
 #include "Acts/EventData/VectorTrackContainer.hpp"

Alignment/include/ActsAlignment/Kernel/AlignmentError.hpp

@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 

Alignment/include/ActsAlignment/Kernel/AlignmentMask.hpp

@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 

Alignment/include/ActsAlignment/Kernel/detail/AlignmentEngine.hpp

@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 

Alignment/src/Kernel/detail/AlignmentEngine.cpp

@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsAlignment/Kernel/detail/AlignmentEngine.hpp"