Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
jakobandersen committed Jan 17, 2021
2 parents 91cfc11 + edf8a19 commit e13aa2a
Show file tree
Hide file tree
Showing 284 changed files with 9,637 additions and 10,223 deletions.
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
build
!build/mod-*.tar.gz
stage
172 changes: 154 additions & 18 deletions .drone.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,26 @@ local CoverageStep(withCoverage, compiler, boost) = if !withCoverage then null e
environment: {
CTEST_OUTPUT_ON_FAILURE: 1,
CXX: compiler,
CXXFLAGS: "-Werror",
},
commands: [
"mkdir covBuild",
"cd covBuild",
"cmake ../ -DBUILD_TESTING=on -DBUILD_COVERAGE=on %s" % [boostArg(boost)],
"cmake ../ -DCMAKE_BUILD_TYPE=OptDebug -DBUILD_TESTING=on -DBUILD_COVERAGE=on %s" % [boostArg(boost)],
"make",
"make install",
"make tests",
"make coverage_collect",
"make coverage_build",
"/copyCoverage.sh",
],
when: {
ref: [
"refs/heads/develop",
"refs/heads/master",
"refs/tags/v*",
]
},
volumes: [
{
name: "www",
Expand All @@ -36,27 +44,42 @@ local Volumes(withCoverage) = if !withCoverage then [] else [
},
];

local Bootstrap(dep=false) = {
name: "bootstrap",
image: image,
commands: [
"git fetch --tags",
"git submodule update --init --recursive",
"./bootstrap.sh",
],
[ if dep then "depends_on"]: [ "clone" ],
};

local Configure(compiler, boost, dep=false) = {
name: "configure",
image: image,
environment: {
CXX: compiler,
CXXFLAGS: "-Werror",
},
commands: [
"mkdir build",
"cd build",
"cmake ../ -DCMAKE_BUILD_TYPE=OptDebug -DBUILD_TESTING=on -DBUILD_TESTING_SANITIZERS=off %s" % [boostArg(boost)],
],
[ if dep then "depends_on"]: [ "bootstrap" ],
};

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",
],
},
Bootstrap(),
Configure(compiler, boost),
{
name: "build",
image: image,
environment: {
CXX: compiler,
},
commands: [
"mkdir build",
"cd build",
"cmake ../ -DBUILD_TESTING=on -DBUILD_TESTING_SANITIZERS=off %s" % [boostArg(boost)],
"make",
Expand Down Expand Up @@ -84,21 +107,134 @@ local Pipeline(withCoverage, compiler, boost) = {
commands: [
"cd build",
"make install",
"ctest --output-on-failure",
"ctest --output-on-failure -E cmake_add_subdirectory_build",
],
},
{
name: "simple test",
image: image,
commands: [
"cd build",
"make install",
"cd ../",
"mod -e \"smiles('O').print()\"",
],
},
{
name: "test subdirectory build",
image: image,
commands: [
"cd build",
"make install",
"ctest --output-on-failure -R cmake_add_subdirectory_build",
],
when: {
ref: [
"refs/heads/develop",
"refs/heads/master",
"refs/tags/v*",
]
},
},
CoverageStep(withCoverage, compiler, boost),
],
volumes: Volumes(withCoverage),
};

[
Pipeline(boost == "1_74_0" && compiler == "g++-7", compiler, boost)
{
kind: "pipeline",
name: "Various Static Checks",
steps: [
{
name: "Python, mypy",
image: image,
commands: [
"./scripts/mypy.sh",
],
depends_on: [ "clone" ],
},
{
name: "Python, flake8",
image: image,
commands: [
"./scripts/flake8.sh",
],
depends_on: [ "clone" ],
},
{
name: "Symbol Visibility, json",
image: image,
commands: [
"./scripts/checkJsonVisibility.sh",
],
depends_on: [ "clone" ],
},
]
},
{
kind: "pipeline",
name: "Docker",
steps: [
Bootstrap(false),
Configure("g++", "1_75_0", false),
{
name: "dist",
image: image,
commands: [
"cd build",
"make dist",
],
//depends_on: [ "configure" ],
},
{
name: "Ubuntu",
image: "plugins/docker",
settings: {
repo: "jakobandersen/mod",
tags: ["ubuntu-test"],
dockerfile: "docker/Ubuntu.Dockerfile",
dry_run: true,
purge: true,
build_args: ["j=1"],
},
//depends_on: [ "dist" ],
},
{
name: "Fedora",
image: "plugins/docker",
settings: {
repo: "jakobandersen/mod",
tags: ["fedora-test"],
dockerfile: "docker/Fedora.Dockerfile",
dry_run: true,
purge: true,
build_args: ["j=1"],
},
//depends_on: [ "dist" ],
},
{
name: "Arch",
image: "plugins/docker",
settings: {
repo: "jakobandersen/mod",
tags: ["arch-test"],
dockerfile: "docker/Arch.Dockerfile",
dry_run: true,
purge: true,
build_args: ["j=1"],
},
//depends_on: [ "dist" ],
},
]
},
] + [
Pipeline(boost == "1_74_0" && compiler == "g++-9", compiler, boost)
for compiler in [
"g++-7", "g++-8", "g++-9", "g++-10",
"clang++-6.0", "clang++-7", "clang++-8", "clang++-9", "clang++-10",
"clang++-8", "clang++-9", "clang++-10",
]
for boost in [
"1_72_0", "1_73_0", "1_74_0",
"1_73_0", "1_74_0", "1_75_0",
]
]
Loading

0 comments on commit e13aa2a

Please sign in to comment.