Skip to content

Commit

Permalink
Merge branch 'main' into geoShapeToDetVol
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthewharri authored Jul 19, 2024
2 parents 6fdc26b + e754bf8 commit 47b7235
Show file tree
Hide file tree
Showing 254 changed files with 3,612 additions and 3,162 deletions.
1 change: 1 addition & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
- changed-files:
- any-glob-to-any-file:
- docs/**
- '**/*.rst'
'Changes Performance':
- changed-files:
- any-glob-to-any-file:
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ env:
jobs:
build_debug:
runs-on: ubuntu-latest
container: ghcr.io/acts-project/ubuntu2404:51
container: ghcr.io/acts-project/ubuntu2404:53
steps:

- uses: actions/checkout@v4
Expand All @@ -51,9 +51,8 @@ jobs:
-DCMAKE_BUILD_TYPE=Debug
-DCMAKE_CXX_FLAGS="-Werror --coverage -g -gz -g1"
-DACTS_BUILD_UNITTESTS=on
-DACTS_BUILD_EXAMPLES_UNITTESTS=off
-DACTS_BUILD_EXAMPLES_UNITTESTS=ON
-DACTS_BUILD_EVERYTHING=ON
-DACTS_BUILD_EXAMPLES_UNIT_TESTS=ON
-DACTS_BUILD_ODD=OFF
-DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
-DACTS_BUILD_EXAMPLES_EDM4HEP=ON
Expand Down Expand Up @@ -98,7 +97,7 @@ jobs:

build_performance:
runs-on: ubuntu-latest
container: ghcr.io/acts-project/ubuntu2404:51
container: ghcr.io/acts-project/ubuntu2404:53
if: github.ref == 'refs/heads/main'
steps:
- uses: actions/checkout@v4
Expand Down
43 changes: 22 additions & 21 deletions .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ env:
jobs:
linux_ubuntu:
runs-on: ubuntu-latest
container: ghcr.io/acts-project/ubuntu2404:51
container: ghcr.io/acts-project/ubuntu2404:53
env:
INSTALL_DIR: ${{ github.workspace }}/install
ACTS_LOG_FAILURE_THRESHOLD: WARNING
Expand All @@ -47,24 +47,24 @@ jobs:
${{ runner.os }}-ccache-linux_ubuntu_${{ env.CCACHE_KEY_SUFFIX }}_
- name: Configure
# setting CMAKE_CXX_STANDARD=17 is a workaround for a bug in the
# setting CMAKE_CXX_STANDARD=20 is a workaround for a bug in the
# dd4hep CMake configuration that gets triggered on recent CMake
# versions
# Need to set git user & email for patching to work (GeoModel plugin)
run: >
git config --global user.name 'CI' &&
git config --global user.name 'CI' &&
git config --global user.email '<>' &&
ccache -z &&
cmake -B build -S .
-GNinja
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_CXX_FLAGS=-Werror
-DCMAKE_CXX_STANDARD=17
-DCMAKE_CXX_STANDARD=20
-DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
-DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON
-DACTS_BUILD_EVERYTHING=ON
-DACTS_BUILD_EXAMPLES_UNIT_TESTS=ON
-DACTS_BUILD_EXAMPLES_UNITTESTS=ON
-DACTS_BUILD_ODD=ON
-DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
-DACTS_BUILD_EXAMPLES_EDM4HEP=ON
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
-GNinja
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_CXX_FLAGS=-Werror
-DCMAKE_CXX_STANDARD=17
-DCMAKE_CXX_STANDARD=20
-DCMAKE_PREFIX_PATH="${INSTALL_DIR}"
- name: Downstream build
Expand All @@ -122,7 +122,7 @@ jobs:

linux_examples_test:
runs-on: ubuntu-latest
container: ghcr.io/acts-project/ubuntu2404:51
container: ghcr.io/acts-project/ubuntu2404:53
needs: [linux_ubuntu]
env:
ACTS_SEQUENCER_DISABLE_FPEMON: true
Expand Down Expand Up @@ -159,7 +159,7 @@ jobs:
linux_physmon:
runs-on: ubuntu-latest
container: ghcr.io/acts-project/ubuntu2404:51
container: ghcr.io/acts-project/ubuntu2404:53
needs: [linux_ubuntu]
env:
ACTS_SEQUENCER_DISABLE_FPEMON: true
Expand Down Expand Up @@ -198,7 +198,10 @@ jobs:
&& source build/this_acts_withdeps.sh
&& echo "::endgroup::"
&& CI/physmon/phys_perf_mon.sh all physmon
&& cat physmon/summary.md >> $GITHUB_STEP_SUMMARY
- name: Post step summary
if: always()
run: cat physmon/summary.md >> $GITHUB_STEP_SUMMARY

- uses: actions/upload-artifact@v4
if: always()
Expand Down Expand Up @@ -239,13 +242,11 @@ jobs:
strategy:
matrix:
include:
- image: ubuntu2404
std: 17
- image: ubuntu2204_cpp20
- image: ubuntu2204
std: 20
- image: ubuntu2204_clang
std: 17
container: ghcr.io/acts-project/${{ matrix.image }}:51
std: 20
container: ghcr.io/acts-project/${{ matrix.image }}:53
env:
INSTALL_DIR: ${{ github.workspace }}/install
ACTS_LOG_FAILURE_THRESHOLD: WARNING
Expand All @@ -269,7 +270,7 @@ jobs:
- name: Configure
# setting CMAKE_CXX_STANDARD=17 is a workaround for a bug in the
# setting CMAKE_CXX_STANDARD=20 is a workaround for a bug in the
# dd4hep CMake configuration that gets triggered on recent CMake
# versions
run: >
Expand All @@ -283,7 +284,7 @@ jobs:
-DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
-DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON
-DACTS_BUILD_EVERYTHING=ON
-DACTS_BUILD_EXAMPLES_UNIT_TESTS=ON
-DACTS_BUILD_EXAMPLES_UNITTESTS=ON
-DACTS_BUILD_ODD=ON
-DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
-DACTS_BUILD_EXAMPLES_EDM4HEP=ON
Expand Down Expand Up @@ -319,7 +320,7 @@ jobs:
-GNinja
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_CXX_FLAGS=-Werror
-DCMAKE_CXX_STANDARD=17
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
-DCMAKE_PREFIX_PATH="${INSTALL_DIR}"
- name: Downstream build
Expand Down Expand Up @@ -367,7 +368,7 @@ jobs:
${{ runner.os }}-ccache_${{ env.CCACHE_KEY_SUFFIX }}_
- name: Configure
# setting CMAKE_CXX_STANDARD=17 is a workaround for a bug in the
# setting CMAKE_CXX_STANDARD=20 is a workaround for a bug in the
# dd4hep CMake configuration that gets triggered on recent CMake
# versions such as the one installed via homebrew
run: >
Expand All @@ -380,11 +381,11 @@ jobs:
-DDD4HEP_DEBUG_CMAKE=ON
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_CXX_FLAGS=-Werror
-DCMAKE_CXX_STANDARD=17
-DCMAKE_CXX_STANDARD=20
-DCMAKE_INSTALL_PREFIX="${{ env.INSTALL_DIR }}"
-DCMAKE_PREFIX_PATH=/usr/local/acts
-DACTS_BUILD_EVERYTHING=ON
-DACTS_BUILD_EXAMPLES_UNIT_TESTS=ON
-DACTS_BUILD_EXAMPLES_UNITTESTS=ON
-DACTS_BUILD_ODD=ON
-DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON
-DACTS_FORCE_ASSERTIONS=ON
Expand Down Expand Up @@ -417,7 +418,7 @@ jobs:
-GNinja
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_CXX_FLAGS=-Werror
-DCMAKE_CXX_STANDARD=17
-DCMAKE_CXX_STANDARD=20
-DCMAKE_PREFIX_PATH="${INSTALL_DIR}"
- name: Downstream build
run: cmake --build build-downstream
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ concurrency:
jobs:
format:
runs-on: ubuntu-latest
container: ghcr.io/acts-project/format14:v41
container: ghcr.io/acts-project/format14:51
steps:
- uses: actions/checkout@v4
- name: Check
Expand Down
69 changes: 0 additions & 69 deletions .github/workflows/iwyu.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
sonarcloud:
name: SonarCloud
runs-on: ubuntu-latest
container: ghcr.io/acts-project/ubuntu2204:v41
container: ghcr.io/acts-project/ubuntu2204:53
if: github.event.workflow_run.conclusion == 'success'
steps:
- name: Dump job context
Expand Down
Loading

0 comments on commit 47b7235

Please sign in to comment.