From 0fffbb8488bb88a938e2303fbab7874cbbb797fd Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Tue, 20 Dec 2016 19:06:15 +0100 Subject: [PATCH 01/11] :construction_worker: trying Doozer --- .doozer.json | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .doozer.json diff --git a/.doozer.json b/.doozer.json new file mode 100644 index 00000000..67012d8d --- /dev/null +++ b/.doozer.json @@ -0,0 +1,9 @@ +{ + "targets": { + "xenial-amd64": { + "buildenv": "xenial-amd64", + "builddeps": ["build-essential"], + "buildcmd": ["make check"] + } + } +} From 1178a8152a7bab880c466d1d6be411ce66f59e90 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Tue, 20 Dec 2016 19:13:19 +0100 Subject: [PATCH 02/11] :construction_worker: using cmake with Doozer --- .doozer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.doozer.json b/.doozer.json index 67012d8d..97f52598 100644 --- a/.doozer.json +++ b/.doozer.json @@ -2,8 +2,8 @@ "targets": { "xenial-amd64": { "buildenv": "xenial-amd64", - "builddeps": ["build-essential"], - "buildcmd": ["make check"] + "builddeps": ["build-essential", "cmake"], + "buildcmd": ["mkdir cm ; cd cm ; cmake .. ; cbuild . ; ctest"] } } } From 73b28e8f922e539a6317b887d4ece8a3add05638 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Tue, 20 Dec 2016 19:16:52 +0100 Subject: [PATCH 03/11] :construction_worker: fixing build command --- .doozer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.doozer.json b/.doozer.json index 97f52598..89386481 100644 --- a/.doozer.json +++ b/.doozer.json @@ -3,7 +3,7 @@ "xenial-amd64": { "buildenv": "xenial-amd64", "builddeps": ["build-essential", "cmake"], - "buildcmd": ["mkdir cm ; cd cm ; cmake .. ; cbuild . ; ctest"] + "buildcmd": ["mkdir cm", "cd cm", "cmake ..", "cmake --build .", "ctest"] } } } From 38597ac62826d1acb8fc557e4127f3c62f8f4109 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Tue, 20 Dec 2016 23:04:07 +0100 Subject: [PATCH 04/11] :construction_worker: added more builders --- .doozer.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.doozer.json b/.doozer.json index 89386481..eaea3b02 100644 --- a/.doozer.json +++ b/.doozer.json @@ -4,6 +4,16 @@ "buildenv": "xenial-amd64", "builddeps": ["build-essential", "cmake"], "buildcmd": ["mkdir cm", "cd cm", "cmake ..", "cmake --build .", "ctest"] + }, + "xenial-i386": { + "buildenv": "xenial-i386", + "builddeps": ["build-essential", "cmake"], + "buildcmd": ["mkdir cm", "cd cm", "cmake ..", "cmake --build .", "ctest"] + }, + "osx": { + "buildenv": "osx", + "builddeps": ["build-essential", "cmake"], + "buildcmd": ["mkdir cm", "cd cm", "cmake ..", "cmake --build .", "ctest"] } } } From c6fbd305b04866632c8a2c5cf501a77f94efc57d Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Wed, 21 Dec 2016 09:17:17 +0100 Subject: [PATCH 05/11] :construction_worker: trying more doozer workers --- .doozer.json | 45 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 5 deletions(-) diff --git a/.doozer.json b/.doozer.json index eaea3b02..3781b86d 100644 --- a/.doozer.json +++ b/.doozer.json @@ -1,19 +1,54 @@ { "targets": { - "xenial-amd64": { - "buildenv": "xenial-amd64", + "jessie-i386": { + "buildenv": "jessie-i386", "builddeps": ["build-essential", "cmake"], - "buildcmd": ["mkdir cm", "cd cm", "cmake ..", "cmake --build .", "ctest"] + "buildcmd": ["mkdir cm", "cd cm", "cmake ..", "cmake --build .", "ctest --output-on-failure"] + }, + "precise-i386": { + "buildenv": "precise-i386", + "builddeps": ["build-essential", "cmake"], + "buildcmd": ["mkdir cm", "cd cm", "cmake ..", "cmake --build .", "ctest --output-on-failure"] + }, + "precise-amd64": { + "buildenv": "precise-amd64", + "builddeps": ["build-essential", "cmake"], + "buildcmd": ["mkdir cm", "cd cm", "cmake ..", "cmake --build .", "ctest --output-on-failure"] + }, + "trusty-i386": { + "buildenv": "trusty-i386", + "builddeps": ["build-essential", "cmake"], + "buildcmd": ["mkdir cm", "cd cm", "cmake ..", "cmake --build .", "ctest --output-on-failure"] + }, + "trusty-amd64": { + "buildenv": "trusty-amd64", + "builddeps": ["build-essential", "cmake"], + "buildcmd": ["mkdir cm", "cd cm", "cmake ..", "cmake --build .", "ctest --output-on-failure"] }, "xenial-i386": { "buildenv": "xenial-i386", "builddeps": ["build-essential", "cmake"], - "buildcmd": ["mkdir cm", "cd cm", "cmake ..", "cmake --build .", "ctest"] + "buildcmd": ["mkdir cm", "cd cm", "cmake ..", "cmake --build .", "ctest --output-on-failure"] + }, + "xenial-amd64": { + "buildenv": "xenial-amd64", + "builddeps": ["build-essential", "cmake"], + "buildcmd": ["mkdir cm", "cd cm", "cmake ..", "cmake --build .", "ctest --output-on-failure"] + }, + "fedora24-x86_64": { + "buildenv": "fedora24-x86_64", + "builddeps": ["build-essential", "cmake"], + "buildcmd": ["mkdir cm", "cd cm", "cmake ..", "cmake --build .", "ctest --output-on-failure"] + }, + "centos7-x86_64": { + "buildenv": "centos7-x86_64", + "builddeps": ["build-essential", "cmake"], + "buildcmd": ["mkdir cm", "cd cm", "cmake ..", "cmake --build .", "ctest --output-on-failure"] }, "osx": { "buildenv": "osx", "builddeps": ["build-essential", "cmake"], - "buildcmd": ["mkdir cm", "cd cm", "cmake ..", "cmake --build .", "ctest"] + "buildcmd": ["mkdir cm", "cd cm", "cmake ..", "cmake --build .", "ctest --output-on-failure"] } } } From 2e5208d5cdf735bb7f2588992a2ceb0a63abecdd Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Wed, 21 Dec 2016 09:19:53 +0100 Subject: [PATCH 06/11] :construction_worker: there is no cmake in the osx image --- .doozer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.doozer.json b/.doozer.json index 3781b86d..072270d5 100644 --- a/.doozer.json +++ b/.doozer.json @@ -47,8 +47,8 @@ }, "osx": { "buildenv": "osx", - "builddeps": ["build-essential", "cmake"], - "buildcmd": ["mkdir cm", "cd cm", "cmake ..", "cmake --build .", "ctest --output-on-failure"] + "builddeps": ["build-essential"], + "buildcmd": ["make check"] } } } From f78671de8e8fe94e88d674c78428a71e72d89d89 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Wed, 21 Dec 2016 09:33:16 +0100 Subject: [PATCH 07/11] :construction_worker: Fedora has no package "build-essential" --- .doozer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.doozer.json b/.doozer.json index 072270d5..fad1a6a0 100644 --- a/.doozer.json +++ b/.doozer.json @@ -37,7 +37,7 @@ }, "fedora24-x86_64": { "buildenv": "fedora24-x86_64", - "builddeps": ["build-essential", "cmake"], + "builddeps": ["cmake"], "buildcmd": ["mkdir cm", "cd cm", "cmake ..", "cmake --build .", "ctest --output-on-failure"] }, "centos7-x86_64": { From 91e45a8dd0b560ac01d3ad14c0b45bbfbebea094 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Wed, 21 Dec 2016 09:47:31 +0100 Subject: [PATCH 08/11] :construction_worker: the cmake of trusty is too old --- .doozer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.doozer.json b/.doozer.json index fad1a6a0..808dbf21 100644 --- a/.doozer.json +++ b/.doozer.json @@ -18,12 +18,12 @@ "trusty-i386": { "buildenv": "trusty-i386", "builddeps": ["build-essential", "cmake"], - "buildcmd": ["mkdir cm", "cd cm", "cmake ..", "cmake --build .", "ctest --output-on-failure"] + "buildcmd": ["make check"] }, "trusty-amd64": { "buildenv": "trusty-amd64", "builddeps": ["build-essential", "cmake"], - "buildcmd": ["mkdir cm", "cd cm", "cmake ..", "cmake --build .", "ctest --output-on-failure"] + "buildcmd": ["make check"] }, "xenial-i386": { "buildenv": "xenial-i386", From 937cca762fe0e5080a6851ed922deb8d4dd7a0ff Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Wed, 21 Dec 2016 09:54:11 +0100 Subject: [PATCH 09/11] :construction_worker: forgot to install make --- .doozer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.doozer.json b/.doozer.json index 808dbf21..2e1f73d5 100644 --- a/.doozer.json +++ b/.doozer.json @@ -37,7 +37,7 @@ }, "fedora24-x86_64": { "buildenv": "fedora24-x86_64", - "builddeps": ["cmake"], + "builddeps": ["cmake", "make"], "buildcmd": ["mkdir cm", "cd cm", "cmake ..", "cmake --build .", "ctest --output-on-failure"] }, "centos7-x86_64": { From 2cf0f299ade6c778d7c38c06d2fe2559d75ba683 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Wed, 21 Dec 2016 10:13:59 +0100 Subject: [PATCH 10/11] :construction_worker: using clang where GCC is too old --- .doozer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.doozer.json b/.doozer.json index 2e1f73d5..67aaa8d7 100644 --- a/.doozer.json +++ b/.doozer.json @@ -2,8 +2,8 @@ "targets": { "jessie-i386": { "buildenv": "jessie-i386", - "builddeps": ["build-essential", "cmake"], - "buildcmd": ["mkdir cm", "cd cm", "cmake ..", "cmake --build .", "ctest --output-on-failure"] + "builddeps": ["build-essential", "cmake", "clang"], + "buildcmd": ["mkdir cm", "cd cm", "CXX=clang++ cmake ..", "cmake --build .", "ctest --output-on-failure"] }, "precise-i386": { "buildenv": "precise-i386", @@ -17,13 +17,13 @@ }, "trusty-i386": { "buildenv": "trusty-i386", - "builddeps": ["build-essential", "cmake"], - "buildcmd": ["make check"] + "builddeps": ["build-essential", "cmake", "clang"], + "buildcmd": ["make check CXX=clang++"] }, "trusty-amd64": { "buildenv": "trusty-amd64", - "builddeps": ["build-essential", "cmake"], - "buildcmd": ["make check"] + "builddeps": ["build-essential", "cmake", "clang"], + "buildcmd": ["make check CXX=clang++"] }, "xenial-i386": { "buildenv": "xenial-i386", From 7107072f71e1e80362a1fe4e6812e381efade7d5 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Wed, 21 Dec 2016 10:33:36 +0100 Subject: [PATCH 11/11] :construction_worker: clang for fedora --- .doozer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.doozer.json b/.doozer.json index 67aaa8d7..589dccc3 100644 --- a/.doozer.json +++ b/.doozer.json @@ -37,8 +37,8 @@ }, "fedora24-x86_64": { "buildenv": "fedora24-x86_64", - "builddeps": ["cmake", "make"], - "buildcmd": ["mkdir cm", "cd cm", "cmake ..", "cmake --build .", "ctest --output-on-failure"] + "builddeps": ["cmake", "make", "clang"], + "buildcmd": ["mkdir cm", "cd cm", "CXX=clang++ cmake ..", "cmake --build .", "ctest --output-on-failure"] }, "centos7-x86_64": { "buildenv": "centos7-x86_64",