Skip to content

Commit

Permalink
Merge branch 'main' into si_sensor_unit
Browse files Browse the repository at this point in the history
  • Loading branch information
ShujieL authored Jul 24, 2024
2 parents 8928170 + 50bc89b commit a5cc00e
Show file tree
Hide file tree
Showing 238 changed files with 9,380 additions and 14,051 deletions.
118 changes: 12 additions & 106 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -1,111 +1,17 @@
---
Language: Cpp
BasedOnStyle: Chromium
AccessModifierOffset: -2
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: true
AlignConsecutiveDeclarations: true
AlignEscapedNewlines: Right
AlignOperands: true
AlignTrailingComments: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: true
BinPackArguments: true
BinPackParameters: true
BraceWrapping:
AfterClass: false
AfterControlStatement: false
AfterEnum: false
AfterFunction: true
AfterNamespace: false
AfterObjCDeclaration: false
AfterStruct: false
AfterUnion: false
AfterExternBlock: false
BeforeCatch: false
BeforeElse: false
IndentBraces: false
SplitEmptyFunction: true
SplitEmptyRecord: true
SplitEmptyNamespace: true
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Custom
BreakBeforeInheritanceComma: false
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
BreakConstructorInitializers: BeforeColon
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: true
ColumnLimit: 120
CommentPragmas: '^ IWYU pragma:'
CompactNamespaces: false
ConstructorInitializerAllOnOneLineOrOnePerLine: false
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
BasedOnStyle: LLVM
BreakConstructorInitializersBeforeComma: true
ConstructorInitializerAllOnOneLineOrOnePerLine: true
Cpp11BracedListStyle: true
DerivePointerAlignment: false
DisableFormat: false
ExperimentalAutoDetectBinPacking: false
FixNamespaceComments: true
ForEachMacros:
- foreach
- Q_FOREACH
- BOOST_FOREACH
Standard: c++20
#SpaceBeforeParens: ControlStatements
SpaceAfterControlStatementKeyword: true
PointerBindsToType: true
IncludeBlocks: Preserve
IncludeCategories:
- Regex: '^"(llvm|llvm-c|clang|clang-c)/'
Priority: 2
- Regex: '^(<|"(gtest|gmock|isl|json)/)'
Priority: 3
- Regex: '.*'
Priority: 1
IncludeIsMainRegex: '(Test)?$'
IndentCaseLabels: false
IndentPPDirectives: None
IndentWidth: 2
IndentWrappedFunctionNames: false
JavaScriptQuotes: Leave
JavaScriptWrapImports: true
KeepEmptyLinesAtTheStartOfBlocks: true
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 1
NamespaceIndentation: All
ObjCBlockIndentWidth: 2
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
PenaltyBreakAssignment: 2
PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakString: 1000
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60
PointerAlignment: Left
ReflowComments: true
SortIncludes: true
SortUsingDeclarations: true
SpaceAfterCStyleCast: false
SpaceAfterTemplateKeyword: true
SpaceBeforeAssignmentOperators: true
SpaceBeforeParens: ControlStatements
#SpaceBeforeRangeBasedForLoopColon: true
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: false
SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Cpp11
TabWidth: 8
UseTab: Never
ColumnLimit: 100
NamespaceIndentation: Inner
AlignConsecutiveAssignments: true
SortIncludes: Never
ReflowComments: false
...
4 changes: 2 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"name": "eic-shell",
"image": "ghcr.io/eic/jug_xl:nightly"
"name": "eic-shell",
"image": "ghcr.io/eic/jug_xl:nightly"
}
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2ffa142d0bd7055cfbfd9ab7838f5e0b7f6c551c # feat(ci): change pre-commit clang-format to run in ci
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:
- package-ecosystem: "github-actions" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
127 changes: 77 additions & 50 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,73 +1,100 @@
"topic: backward":
- "compact/**/backward_*"
- "compact/**/mrich*"
- "compact/**/pfrich*"
- changed-files:
- any-glob-to-any-file:
- "compact/**/backward_*"
- "compact/**/mrich*"
- "compact/**/pfrich*"

"topic: barrel":
- "compact/**/barrel_*"
- "compact/**/*_barrel.xml"
- "compact/**/dirc*"
- "compact/hcal_gdml.xml"
- "src/Barrel*"
- "src/SciGlassCalorimeter_geo.cpp"
- changed-files:
- any-glob-to-any-file:
- "compact/**/barrel_*"
- "compact/**/*_barrel.xml"
- "compact/**/dirc*"
- "compact/hcal_gdml.xml"
- "src/Barrel*"
- "src/SciGlassCalorimeter_geo.cpp"

"topic: calorimetry":
- "compact/ecal/**/*"
- "compact/hcal/**/*"
- "compact/hcal_gdml.xml"
- "src/*Calorimeter*"
- changed-files:
- any-glob-to-any-file:
- "compact/ecal/**/*"
- "compact/hcal/**/*"
- "compact/hcal_gdml.xml"
- "src/*Calorimeter*"

"topic: documentation":
- "**/*.md"
- changed-files:
- any-glob-to-any-file:
- "**/*.md"

"topic: far-backward":
- "compact/far_backward/**"
- "src/Backwards*"
- changed-files:
- any-glob-to-any-file:
- "compact/far_backward/**"
- "src/Backwards*"

"topic: far-forward":
- "compact/far_forward/**"
- "src/Forward*"
- "src/B0*"
- "src/ZDC*"
- "src/ZeroDegreeCalorimeter*"
- changed-files:
- any-glob-to-any-file:
- "compact/far_forward/**"
- "src/Forward*"
- "src/B0*"
- "src/ZDC*"
- "src/ZeroDegreeCalorimeter*"

"topic: forward":
- "compact/**/forward_*"
- "compact/**/drich*"
- "src/*Tracker*"
- changed-files:
- any-glob-to-any-file:
- "compact/**/forward_*"
- "compact/**/drich*"
- "src/*Tracker*"

"topic: infrastructure":
- ".*"
- ".github/**/*"
- "CMakeLists.txt"
- "bin/**/*"
- "doc/**/*"
- "macro/**/*"
- "reports/**/*"
- "requirements.txt"
- "scripts/**/*"
- "templates/setup.sh.in"
- "views/**/*"
- changed-files:
- any-glob-to-any-file:
- ".*"
- ".github/**/*"
- "CMakeLists.txt"
- "bin/**/*"
- "doc/**/*"
- "macro/**/*"
- "reports/**/*"
- "requirements.txt"
- "scripts/**/*"
- "templates/thisepic.sh.in"
- "views/**/*"

"topic: magnets":
- "compact/far_backward/magnets.xml"
- "compact/far_forward/magnets.xml"
- "compact/fields/**/*"
- "compact/fields.xml"
- "compact/solenoid.xml"
- changed-files:
- any-glob-to-any-file:
- "compact/far_backward/magnets.xml"
- "compact/far_forward/magnets.xml"
- "compact/fields/**/*"
- "compact/fields.xml"
- "compact/solenoid.xml"

"topic: materials":
- "compact/materials.xml"
- "compact/optical_materials.xml"
- changed-files:
- any-glob-to-any-file:
- "compact/materials.xml"
- "compact/optical_materials.xml"

"topic: PID":
- "compact/pid/**/*"
- "compact/tracking/**/tof_*"
- "src/*RICH*"
- "src/*DIRC*"
- "src/*TOF*"
- "src/MRich*"
- changed-files:
- any-glob-to-any-file:
- "compact/pid/**/*"
- "compact/tracking/**/tof_*"
- "src/*RICH*"
- "src/*DIRC*"
- "src/*TOF*"
- "src/MRich*"

"topic: tracking":
- any: ["compact/tracking/**/*", "!compact/tracking/**/tof_*"]
- "src/*Tracker*"
- all:
- changed-files:
- any-glob-to-any-file:
- "compact/tracking/**/*"
- "src/*Tracker*"
- all-globs-to-all-files:
- "!compact/tracking/**/tof_*"
2 changes: 1 addition & 1 deletion .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ jobs:
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v4
- uses: actions/labeler@v5
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
Loading

0 comments on commit a5cc00e

Please sign in to comment.