Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into time-offset
Browse files Browse the repository at this point in the history
  • Loading branch information
C.A.P. Linssen committed Dec 1, 2022
2 parents 0fe481c + daf3afb commit 6ba79f1
Show file tree
Hide file tree
Showing 1,412 changed files with 118,817 additions and 51,819 deletions.
141 changes: 103 additions & 38 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -1,58 +1,123 @@
BasedOnStyle: WebKit

Language: Cpp
AccessModifierOffset: -2
AlignEscapedNewlinesLeft: true
AlignAfterOpenBracket: DontAlign
AlignConsecutiveMacros: false
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
AlignEscapedNewlines: Left
AlignOperands: false
AlignTrailingComments: true
AllowAllArgumentsOnNextLine: true
AllowAllConstructorInitializersOnNextLine: true
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: false # not in 3.4
AllowShortCaseLabelsOnASingleLine: false # not in 3.4, 3.5
AllowShortFunctionsOnASingleLine: None # not in 3.4
AllowShortIfStatementsOnASingleLine: false
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: None
AllowShortLambdasOnASingleLine: All
AllowShortIfStatementsOnASingleLine: Never
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: true # not in 3.4, 3.5
AlwaysBreakAfterDefinitionReturnType: All
AlwaysBreakAfterReturnType: AllDefinitions
AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: true

BinPackArguments: false # not in 3.4, 3.5
AlwaysBreakTemplateDeclarations: Yes
BinPackArguments: false
BinPackParameters: false
BreakBeforeBinaryOperators: NonAssignment # not in 3.4 # true in 3.5
BraceWrapping:
AfterCaseLabel: true
AfterClass: true
AfterControlStatement: true
AfterEnum: true
AfterFunction: true
AfterNamespace: true
AfterObjCDeclaration: true
AfterStruct: true
AfterUnion: false
AfterExternBlock: true
BeforeCatch: true
BeforeElse: true
IndentBraces: false
SplitEmptyFunction: true
SplitEmptyRecord: true
SplitEmptyNamespace: true
BreakBeforeBinaryOperators: NonAssignment
BreakBeforeBraces: Allman
BreakBeforeInheritanceComma: false
BreakInheritanceList: BeforeColon
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: true

ColumnLimit: 120
BreakConstructorInitializersBeforeComma: false
BreakConstructorInitializers: BeforeComma
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: true
ColumnLimit: 120
CommentPragmas: '^ IWYU pragma:'
CompactNamespaces: false
ConstructorInitializerAllOnOneLineOrOnePerLine: false
ConstructorInitializerIndentWidth: 2
ContinuationIndentWidth: 2

DerivePointerAlignment: false # not in 3.4

Cpp11BracedListStyle: false
DerivePointerAlignment: false
DisableFormat: false
ExperimentalAutoDetectBinPacking: false

FixNamespaceComments: false
ForEachMacros:
- foreach
- Q_FOREACH
- BOOST_FOREACH
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
IndentWidth: 2
IndentWrappedFunctionNames: false # not in 3.4

KeepEmptyLinesAtTheStartOfBlocks: true # not in 3.4

Language: Cpp # not in 3.4

IndentPPDirectives: None
IndentWidth: 2
IndentWrappedFunctionNames: false
JavaScriptQuotes: Leave
JavaScriptWrapImports: true
KeepEmptyLinesAtTheStartOfBlocks: true
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 2

NamespaceIndentation: None

PointerAlignment: Left # not in 3.4
# PointerBindsToType: true # 3.4

SpaceAfterCStyleCast: true # not in 3.4, 3.5
ObjCBinPackProtocolList: Auto
ObjCBlockIndentWidth: 4
ObjCSpaceAfterProperty: true
ObjCSpaceBeforeProtocolList: true
PenaltyBreakAssignment: 2
PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakString: 1000
PenaltyBreakTemplateDeclaration: 10
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60
PointerAlignment: Left
ReflowComments: true
SortIncludes: true
SortUsingDeclarations: true
SpaceAfterCStyleCast: true
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
SpaceBeforeAssignmentOperators: true
SpaceBeforeParens: ControlStatements # not in 3.4
SpaceBeforeCpp11BracedList: true
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: true
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: true
SpacesInAngles: true
SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: true
SpacesInParentheses: true
SpacesInSquareBrackets: true # not in 3.4, 3.5
Standard: Cpp03

UseTab: Never
SpacesInSquareBrackets: true
Standard: Cpp03
StatementMacros:
- Q_UNUSED
- QT_REQUIRE_VERSION
TabWidth: 8
UseTab: Never
1 change: 1 addition & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Checks: '-*,modernize-use-nullptr,modernize-use-override,bugprone,modernize-redundant-void-arg'
15 changes: 15 additions & 0 deletions .github/workflows/build_dispatch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
on: [push]

jobs:
trigger_externals:
if: ${{ github.repository_owner == 'nest' && github.ref_name == 'master' }}
name: "Trigger downstream repos"
runs-on: ubuntu-latest
steps:
- name: Trigger nest/nest-extension-module CI
uses: peter-evans/repository-dispatch@v2
with:
token: ${{ secrets.NEST_EXTENSION_MODULE_TRIGGER_TOKEN }}
repository: 'nest/nest-extension-module'
event-type: dispatch-event_nest-update
client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
25 changes: 25 additions & 0 deletions .github/workflows/jsc-push.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Mirror to JSC

on:
push:
branches: [ master ]

jobs:
sync_to_jsc:
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'nest' }}
steps:
- name: sycnmaster
uses: wei/git-sync@v3
with:
source_repo: "nest/nest-simulator"
source_branch: "master"
destination_repo: "https://ghpusher:${{ secrets.JSC_GITLAB_TOKEN }}@gitlab.jsc.fz-juelich.de/nest/nest-simulator.git"
destination_branch: "master"
- name: synctags
uses: wei/git-sync@v3
with:
source_repo: "nest/nest-simulator"
source_branch: "refs/tags/v*"
destination_repo: "https://ghpusher:${{ secrets.JSC_GITLAB_TOKEN }}@gitlab.jsc.fz-juelich.de/nest/nest-simulator.git"
destination_branch: "refs/tags/v*"
Loading

0 comments on commit 6ba79f1

Please sign in to comment.