Skip to content

Commit 4124b62

Browse files
authored
Merge branch 'AliceO2Group:master' into master
2 parents 3c68f94 + 64150b1 commit 4124b62

453 files changed

Lines changed: 52432 additions & 16501 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.claude/commands/migrate-ccdb.md‎

Lines changed: 201 additions & 18 deletions
Large diffs are not rendered by default.

‎.github/workflows/clean-test.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ name: Clean PR checks
2424
type: boolean
2525
default: true
2626

27-
'check_build/O2Physics/o2/macOS':
28-
description: build/O2Physics/o2/macOS
29-
type: boolean
30-
default: true
31-
3227
'check_build/O2Physics/o2':
3328
description: build/O2Physics/o2
3429
type: boolean
@@ -39,6 +34,11 @@ name: Clean PR checks
3934
type: boolean
4035
default: true
4136

37+
'check_build/O2Physics/code-check':
38+
description: build/O2Physics/code-check
39+
type: boolean
40+
default: true
41+
4242
permissions: {}
4343

4444
jobs:

‎.github/workflows/mega-linter.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
id: ml
4040
# You can override MegaLinter flavor used to have faster performances
4141
# More info at https://megalinter.io/flavors/
42-
uses: oxsecurity/megalinter@v10.0.0
42+
uses: oxsecurity/megalinter@v10.1.0
4343
env:
4444
# All available variables are described in documentation:
4545
# https://megalinter.io/configuration/

‎ALICE3/Core/ALICE3CoreLinkDef.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12+
// NOLINT(build/header_guard)
13+
1214
#pragma link off all globals;
1315
#pragma link off all classes;
1416
#pragma link off all functions;

‎ALICE3/Core/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ o2physics_add_library(ALICE3Core
2020
o2physics_target_root_dictionary(ALICE3Core
2121
HEADERS TrackUtilities.h
2222
FlatLutEntry.h
23+
OTFParticle.h
2324
GeometryContainer.h
2425
LINKDEF ALICE3CoreLinkDef.h)
2526

0 commit comments

Comments
 (0)