Skip to content

Commit

Permalink
Merge branch 'main' of github.com:acts-project/acts into nuke-iwyu
Browse files Browse the repository at this point in the history
  • Loading branch information
andiwand committed Jul 15, 2024
2 parents 41bdfff + 6821b04 commit 8d487de
Show file tree
Hide file tree
Showing 13 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 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:52
container: ghcr.io/acts-project/ubuntu2404:53
steps:

- uses: actions/checkout@v4
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:

build_performance:
runs-on: ubuntu-latest
container: ghcr.io/acts-project/ubuntu2404:52
container: ghcr.io/acts-project/ubuntu2404:53
if: github.ref == 'refs/heads/main'
steps:
- uses: actions/checkout@v4
Expand Down
8 changes: 4 additions & 4 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:52
container: ghcr.io/acts-project/ubuntu2404:53
env:
INSTALL_DIR: ${{ github.workspace }}/install
ACTS_LOG_FAILURE_THRESHOLD: WARNING
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:

linux_examples_test:
runs-on: ubuntu-latest
container: ghcr.io/acts-project/ubuntu2404:52
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:52
container: ghcr.io/acts-project/ubuntu2404:53
needs: [linux_ubuntu]
env:
ACTS_SEQUENCER_DISABLE_FPEMON: true
Expand Down Expand Up @@ -246,7 +246,7 @@ jobs:
std: 20
- image: ubuntu2204_clang
std: 20
container: ghcr.io/acts-project/${{ matrix.image }}:52
container: ghcr.io/acts-project/${{ matrix.image }}:53
env:
INSTALL_DIR: ${{ github.workspace }}/install
ACTS_LOG_FAILURE_THRESHOLD: WARNING
Expand Down
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:52
container: ghcr.io/acts-project/ubuntu2204:53
if: github.event.workflow_run.conclusion == 'success'
steps:
- name: Dump job context
Expand Down
12 changes: 6 additions & 6 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ variables:

clang_tidy:
stage: build
image: ghcr.io/acts-project/ubuntu2404:52
image: ghcr.io/acts-project/ubuntu2404:53
tags:
- large
artifacts:
Expand Down Expand Up @@ -174,7 +174,7 @@ clang_tidy:

build_linux_ubuntu:
stage: build
image: ghcr.io/acts-project/ubuntu2404:52
image: ghcr.io/acts-project/ubuntu2404:53

cache:
key: ccache-${CI_JOB_NAME_SLUG}-${HEAD_REF}-${CCACHE_KEY_SUFFIX}
Expand Down Expand Up @@ -226,7 +226,7 @@ build_linux_ubuntu:

linux_test_examples:
stage: test
image: ghcr.io/acts-project/ubuntu2404:52
image: ghcr.io/acts-project/ubuntu2404:53
needs: [build_linux_ubuntu]

script:
Expand All @@ -247,7 +247,7 @@ linux_test_examples:

linux_physmon:
stage: test
image: ghcr.io/acts-project/ubuntu2404:52
image: ghcr.io/acts-project/ubuntu2404:53
needs: [build_linux_ubuntu]

artifacts:
Expand Down Expand Up @@ -346,7 +346,7 @@ linux_ubuntu_2404:
<<: *linux_ubuntu_extra
variables:
CXXSTD: 20
image: ghcr.io/acts-project/ubuntu2404:52
image: ghcr.io/acts-project/ubuntu2404:53

linux_ubuntu_2204_clang:
<<: *linux_ubuntu_extra
Expand All @@ -360,7 +360,7 @@ linux_ubuntu_2204_clang:
######################

.lcg: &lcg_base_job
image: ghcr.io/acts-project/${OS}-base:52
image: ghcr.io/acts-project/${OS}-base:53
stage: build
tags:
- cvmfs
Expand Down
Binary file modified CI/physmon/reference/particles_ttbar_hist.root
Binary file not shown.
Binary file modified CI/physmon/reference/performance_ambi_ttbar.root
Binary file not shown.
Binary file modified CI/physmon/reference/performance_amvf_gridseeder_ttbar_hist.root
Binary file not shown.
Binary file modified CI/physmon/reference/performance_amvf_ttbar_hist.root
Binary file not shown.
Binary file modified CI/physmon/reference/performance_ckf_ttbar.root
Binary file not shown.
Binary file modified CI/physmon/reference/performance_seeding_ttbar.root
Binary file not shown.
Binary file modified CI/physmon/reference/tracksummary_ckf_ttbar_hist.root
Binary file not shown.
Binary file modified CI/physmon/reference/vertices_ttbar_hist.root
Binary file not shown.
2 changes: 1 addition & 1 deletion Examples/Python/tests/root_file_hashes.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
test_pythia8__pythia8_particles.root: 99085d06a4626d39756283d1b4c3e502d667b2b6fb04be54d09dd599404caca7
test_pythia8__pythia8_particles.root: 6e00f6ab534ef5888861bef3ca5bb47d45171237e875eef0d119df7bda8cba46
test_fatras__particles_simulation.root: bc970873fef0c2efd86ed5413623802353d2cd04abea72de14e8cdfc0e40076f
test_fatras__hits.root: 6e4beb045fa1712c4d14c280ba33c3fa13e4aff9de88d55c3e32f62ad226f724
test_geant4__particles_simulation.root: 3c9c6265183b04c9d62ed5f2d0709c6dd74e33fbb53ac0aeb3274f6600257fc1
Expand Down

0 comments on commit 8d487de

Please sign in to comment.