Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
jakobandersen committed Aug 1, 2019
2 parents 2aa1fab + a4c8807 commit 83a3b7a
Show file tree
Hide file tree
Showing 529 changed files with 36,286 additions and 8,759 deletions.
115 changes: 115 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
Do not use this yet!
---
Language: Cpp
BasedOnStyle: LLVM
#AccessModifierOffset: -2
#AlignAfterOpenBracket: Align
#AlignConsecutiveAssignments: false
#AlignConsecutiveDeclarations: false
#AlignEscapedNewlines: Right
#AlignOperands: true
#AlignTrailingComments: true
#AllowAllParametersOfDeclarationOnNextLine: true
#AllowShortBlocksOnASingleLine: false
#AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Empty
#AllowShortIfStatementsOnASingleLine: false
AllowShortLambdasOnASingleLine: Empty
#AllowShortLoopsOnASingleLine: false
#AlwaysBreakAfterDefinitionReturnType: None
#AlwaysBreakAfterReturnType: None
#AlwaysBreakBeforeMultilineStrings: false
#AlwaysBreakTemplateDeclarations: false
#BinPackArguments: true
#BinPackParameters: true
#BraceWrapping:
# AfterClass: false
# AfterControlStatement: false
# AfterEnum: false
# AfterFunction: false
# 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: Attach
#BreakBeforeInheritanceComma: false
#BreakBeforeTernaryOperators: true
#BreakConstructorInitializersBeforeComma: false
#BreakConstructorInitializers: BeforeColon
#BreakAfterJavaFieldAnnotations: false
#BreakStringLiterals: true
ColumnLimit: 120
#CommentPragmas: '^ IWYU pragma:'
#CompactNamespaces: false
#ConstructorInitializerAllOnOneLineOrOnePerLine: false
ConstructorInitializerIndentWidth: 6
ContinuationIndentWidth: 6
#Cpp11BracedListStyle: true
#DerivePointerAlignment: false
#DisableFormat: false
#ExperimentalAutoDetectBinPacking: false
#FixNamespaceComments: true
#ForEachMacros:
# - foreach
# - Q_FOREACH
# - BOOST_FOREACH
#IncludeBlocks: Preserve
IncludeCategories:
- Regex: '^<mod/lib/'
- Priority: 1
# - Regex: '^"(llvm|llvm-c|clang|clang-c)/'
# Priority: 2
# - Regex: '^(<|"(gtest|gmock|isl|json)/)'
# Priority: 3
- Regex: '.*'
Priority: 10
#IncludeIsMainRegex: '(Test)?$'
#IndentCaseLabels: false
#IndentPPDirectives: None
IndentWidth: 3
#IndentWrappedFunctionNames: false
#JavaScriptQuotes: Leave
#JavaScriptWrapImports: true
#KeepEmptyLinesAtTheStartOfBlocks: true
#MacroBlockBegin: ''
#MacroBlockEnd: ''
#MaxEmptyLinesToKeep: 1
#NamespaceIndentation: None
#ObjCBlockIndentWidth: 2
#ObjCSpaceAfterProperty: false
#ObjCSpaceBeforeProtocolList: true
#PenaltyBreakAssignment: 2
#PenaltyBreakBeforeFirstCallParameter: 19
#PenaltyBreakComment: 300
#PenaltyBreakFirstLessLess: 120
#PenaltyBreakString: 1000
#PenaltyExcessCharacter: 1000000
#PenaltyReturnTypeOnItsOwnLine: 60
#PointerAlignment: Right
ReflowComments: false
#SortIncludes: true
#SortUsingDeclarations: true
#SpaceAfterCStyleCast: false
#SpaceAfterTemplateKeyword: true
#SpaceBeforeAssignmentOperators: true
SpaceBeforeParens: Never
#SpaceInEmptyParentheses: false
#SpacesBeforeTrailingComments: 1
#SpacesInAngles: false
#SpacesInContainerLiterals: true
#SpacesInCStyleCastParentheses: false
#SpacesInParentheses: false
#SpacesInSquareBrackets: false
Standard: Cpp11
TabWidth: 3
UseTab: ForContinuationAndIndentation
...

99 changes: 99 additions & 0 deletions .drone.jsonnet
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
local image = "localhost:5000/jla/mod";
local boostArg(v) = "-DBOOST_ROOT=/opt/boost/%s" % v;

local CoverageStep(withCoverage, compiler, boost) = if !withCoverage then null else {
name: "coverage",
image: image,
environment: {
CTEST_OUTPUT_ON_FAILURE: 1,
CXX: compiler,
},
commands: [
"mkdir covBuild",
"cd covBuild",
"cmake ../ -DBUILD_TESTING=on -DBUILD_COVERAGE=on %s" % [boostArg(boost)],
"make",
"make install",
"make tests",
"make coverage_collect",
"make coverage_build",
"/copyCoverage.sh",
],
volumes: [
{
name: "www",
path: "/www",
},
],
};

local Volumes(withCoverage) = if !withCoverage then [] else [
{
name: "www",
host: {
path: "/www/results/mod",
},
},
];

local Pipeline(withCoverage, compiler, boost) = {
kind: "pipeline",
name: "%s, Boost %s" % [compiler, boost],
steps: [
{
name: "bootstrap",
image: image,
commands: [
"git fetch --tags",
"git submodule update --init --recursive",
"./bootstrap.sh",
],
},
{
name: "build",
image: image,
environment: {
CXX: compiler,
},
commands: [
"mkdir build",
"cd build",
"cmake ../ -DBUILD_TESTING=on -DBUILD_TESTING_SANITIZERS=off %s" % [boostArg(boost)],
"make",
],
},
{
name: "install",
image: image,
commands: [
"cd build",
"make install",
],
},
{
name: "build-test",
image: image,
commands: [
"cd build",
"make tests",
],
},
{
name: "test",
image: image,
commands: [
"cd build",
"make install",
"ctest --output-on-failure",
],
},
CoverageStep(withCoverage, compiler, boost),
],
volumes: Volumes(withCoverage),
};

[
Pipeline(boost == "1_64_0" && compiler == "g++-7", compiler, boost)
for compiler in ["g++-7", "g++-8", "g++-9", "clang++-6.0", "clang++-7"]
for boost in ["1_64_0", "1_65_1", "1_66_0", "1_67_0", "1_68_0", "1_69_0", "1_70_0"]
]
Loading

0 comments on commit 83a3b7a

Please sign in to comment.