From 72dd6f349ef02bf100f2fc5c192032a99d7e5cd7 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sat, 23 Mar 2019 23:18:27 +0100 Subject: [PATCH 01/27] :construction_worker: trying doozer --- .doozer.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .doozer.json diff --git a/.doozer.json b/.doozer.json new file mode 100644 index 00000000..3071e682 --- /dev/null +++ b/.doozer.json @@ -0,0 +1,14 @@ +{ + "targets": { + "xenial-amd64": { + "buildenv": "xenial-amd64", + "builddeps": ["build-essential"], + "buildcmd": [ + "mkdir build", + "cd build", + "cmake ..", + "make" + ] + } + } +} From 2fcca259b04eb66e41c531e96b7d912128474548 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sat, 23 Mar 2019 23:21:17 +0100 Subject: [PATCH 02/27] :construction_worker: added cmake --- .doozer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.doozer.json b/.doozer.json index 3071e682..82b74115 100644 --- a/.doozer.json +++ b/.doozer.json @@ -2,7 +2,7 @@ "targets": { "xenial-amd64": { "buildenv": "xenial-amd64", - "builddeps": ["build-essential"], + "builddeps": ["build-essential", "cmake"], "buildcmd": [ "mkdir build", "cd build", From 490c6e926eb4e4ac7b9fc1b1b25f04a92427f715 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sat, 23 Mar 2019 23:27:39 +0100 Subject: [PATCH 03/27] :construction_worker: using raspbian --- .doozer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.doozer.json b/.doozer.json index 82b74115..2c9d85f5 100644 --- a/.doozer.json +++ b/.doozer.json @@ -1,13 +1,14 @@ { "targets": { - "xenial-amd64": { + "raspbian-jessie": { "buildenv": "xenial-amd64", "builddeps": ["build-essential", "cmake"], "buildcmd": [ "mkdir build", "cd build", "cmake ..", - "make" + "make", + "ctest" ] } } From 7dd3e6384b4cbed874451ec7982d1dca1fa37ff1 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sat, 23 Mar 2019 23:42:29 +0100 Subject: [PATCH 04/27] :construction_worker: added Fedora and CentOS --- .doozer.json | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/.doozer.json b/.doozer.json index 2c9d85f5..fa2f3b64 100644 --- a/.doozer.json +++ b/.doozer.json @@ -7,8 +7,30 @@ "mkdir build", "cd build", "cmake ..", - "make", - "ctest" + "make -j8", + "ctest -j8" + ] + }, + "fedora24-x86_64": { + "buildenv": "xenial-amd64", + "builddeps": ["build-essential", "cmake"], + "buildcmd": [ + "mkdir build", + "cd build", + "cmake ..", + "make -j8", + "ctest -j8" + ] + }, + "centos7-x86_64": { + "buildenv": "xenial-amd64", + "builddeps": ["build-essential", "cmake"], + "buildcmd": [ + "mkdir build", + "cd build", + "cmake ..", + "make -j8", + "ctest -j8" ] } } From bc5089e8032198e04083dc99c9e2d47f1f76ccd2 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 24 Mar 2019 00:02:41 +0100 Subject: [PATCH 05/27] :construction_worker: add test output to avoid timeout --- .doozer.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.doozer.json b/.doozer.json index fa2f3b64..62d267d4 100644 --- a/.doozer.json +++ b/.doozer.json @@ -4,33 +4,36 @@ "buildenv": "xenial-amd64", "builddeps": ["build-essential", "cmake"], "buildcmd": [ + "uname -a", "mkdir build", "cd build", "cmake ..", "make -j8", - "ctest -j8" + "ctest -VV -j8" ] }, "fedora24-x86_64": { "buildenv": "xenial-amd64", "builddeps": ["build-essential", "cmake"], "buildcmd": [ + "uname -a", "mkdir build", "cd build", "cmake ..", "make -j8", - "ctest -j8" + "ctest -VV -j8" ] }, "centos7-x86_64": { "buildenv": "xenial-amd64", "builddeps": ["build-essential", "cmake"], "buildcmd": [ + "uname -a", "mkdir build", "cd build", "cmake ..", "make -j8", - "ctest -j8" + "ctest -VV -j8" ] } } From 6e3e2ee2e429385ed7f0974c9453cb9d60fcfeb8 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 24 Mar 2019 00:11:20 +0100 Subject: [PATCH 06/27] :construction_worker: fixed buildenv values --- .doozer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.doozer.json b/.doozer.json index 62d267d4..f7c6a210 100644 --- a/.doozer.json +++ b/.doozer.json @@ -1,7 +1,7 @@ { "targets": { "raspbian-jessie": { - "buildenv": "xenial-amd64", + "buildenv": "raspbian-jessie", "builddeps": ["build-essential", "cmake"], "buildcmd": [ "uname -a", @@ -13,7 +13,7 @@ ] }, "fedora24-x86_64": { - "buildenv": "xenial-amd64", + "buildenv": "edora24-x86_64", "builddeps": ["build-essential", "cmake"], "buildcmd": [ "uname -a", @@ -25,7 +25,7 @@ ] }, "centos7-x86_64": { - "buildenv": "xenial-amd64", + "buildenv": "centos7-x86_64", "builddeps": ["build-essential", "cmake"], "buildcmd": [ "uname -a", From fabf953305857e80c8f52e183490ca9183ad8f78 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 24 Mar 2019 00:12:36 +0100 Subject: [PATCH 07/27] :construction_worker: fixed a typo --- .doozer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.doozer.json b/.doozer.json index f7c6a210..51c4c962 100644 --- a/.doozer.json +++ b/.doozer.json @@ -13,7 +13,7 @@ ] }, "fedora24-x86_64": { - "buildenv": "edora24-x86_64", + "buildenv": "fedora24-x86_64", "builddeps": ["build-essential", "cmake"], "buildcmd": [ "uname -a", From 4327ae0bef5e65ec975d09a08417ae93b8fa157b Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 24 Mar 2019 00:15:57 +0100 Subject: [PATCH 08/27] :construction_worker: need more recent cmake for CentOS --- .doozer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.doozer.json b/.doozer.json index 51c4c962..1115916d 100644 --- a/.doozer.json +++ b/.doozer.json @@ -26,7 +26,7 @@ }, "centos7-x86_64": { "buildenv": "centos7-x86_64", - "builddeps": ["build-essential", "cmake"], + "builddeps": ["build-essential", "cmake3"], "buildcmd": [ "uname -a", "mkdir build", From a72ac18514fd1e8e88ec09b329a45871384cfc86 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 24 Mar 2019 00:36:05 +0100 Subject: [PATCH 09/27] :construction_worker: use recent cmake --- .doozer.json | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.doozer.json b/.doozer.json index 1115916d..d1ef850c 100644 --- a/.doozer.json +++ b/.doozer.json @@ -2,19 +2,25 @@ "targets": { "raspbian-jessie": { "buildenv": "raspbian-jessie", - "builddeps": ["build-essential", "cmake"], + "builddeps": ["build-essential", "cmake", "wget"], "buildcmd": [ "uname -a", + "wget https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0.tar.gz", + "tar xfz cmake-3.14.0.tar.gz", + "cd cmake-3.14.0" + "cmake . -DBUILD_TESTING=OFF", + "make -j8", + "cd .." "mkdir build", "cd build", - "cmake ..", + "../../cmake-3.14.0/bin/cmake ..", "make -j8", "ctest -VV -j8" ] }, "fedora24-x86_64": { "buildenv": "fedora24-x86_64", - "builddeps": ["build-essential", "cmake"], + "builddeps": ["cmake"], "buildcmd": [ "uname -a", "mkdir build", @@ -26,7 +32,7 @@ }, "centos7-x86_64": { "buildenv": "centos7-x86_64", - "builddeps": ["build-essential", "cmake3"], + "builddeps": ["build-essential", "cmake"], "buildcmd": [ "uname -a", "mkdir build", From 65cdccfa8a13e0952e73fdefaaf5cad04ff15e2a Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 24 Mar 2019 00:36:46 +0100 Subject: [PATCH 10/27] :construction_worker: fixed syntax error --- .doozer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.doozer.json b/.doozer.json index d1ef850c..bac79dc6 100644 --- a/.doozer.json +++ b/.doozer.json @@ -7,10 +7,10 @@ "uname -a", "wget https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0.tar.gz", "tar xfz cmake-3.14.0.tar.gz", - "cd cmake-3.14.0" + "cd cmake-3.14.0", "cmake . -DBUILD_TESTING=OFF", "make -j8", - "cd .." + "cd ..", "mkdir build", "cd build", "../../cmake-3.14.0/bin/cmake ..", From c94b764a6e10d01f7ab046b9683351033713d98b Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 24 Mar 2019 00:43:01 +0100 Subject: [PATCH 11/27] :construction_worker: fixed installation --- .doozer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.doozer.json b/.doozer.json index bac79dc6..0e037e8d 100644 --- a/.doozer.json +++ b/.doozer.json @@ -8,7 +8,7 @@ "wget https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0.tar.gz", "tar xfz cmake-3.14.0.tar.gz", "cd cmake-3.14.0", - "cmake . -DBUILD_TESTING=OFF", + "./bootstrap", "make -j8", "cd ..", "mkdir build", @@ -20,7 +20,7 @@ }, "fedora24-x86_64": { "buildenv": "fedora24-x86_64", - "builddeps": ["cmake"], + "builddeps": ["cmake", "make", "gcc"], "buildcmd": [ "uname -a", "mkdir build", From 63d619e21fbe4b99de9ba7fd4d609d037647b264 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 24 Mar 2019 00:48:59 +0100 Subject: [PATCH 12/27] :construction_worker: need to install g++ --- .doozer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.doozer.json b/.doozer.json index 0e037e8d..3c468df2 100644 --- a/.doozer.json +++ b/.doozer.json @@ -20,7 +20,7 @@ }, "fedora24-x86_64": { "buildenv": "fedora24-x86_64", - "builddeps": ["cmake", "make", "gcc"], + "builddeps": ["cmake", "make", "g++"], "buildcmd": [ "uname -a", "mkdir build", From c871c9a01c1fa01f80ea9942b5037bea25aeb6af Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 24 Mar 2019 06:51:10 +0100 Subject: [PATCH 13/27] :construction_worker: install correct g++ --- .doozer.json | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.doozer.json b/.doozer.json index 3c468df2..0ba65fdf 100644 --- a/.doozer.json +++ b/.doozer.json @@ -13,14 +13,14 @@ "cd ..", "mkdir build", "cd build", - "../../cmake-3.14.0/bin/cmake ..", + "../cmake-3.14.0/bin/cmake ..", "make -j8", "ctest -VV -j8" ] }, "fedora24-x86_64": { "buildenv": "fedora24-x86_64", - "builddeps": ["cmake", "make", "g++"], + "builddeps": ["cmake", "make", "gcc gcc-c++"], "buildcmd": [ "uname -a", "mkdir build", @@ -32,12 +32,18 @@ }, "centos7-x86_64": { "buildenv": "centos7-x86_64", - "builddeps": ["build-essential", "cmake"], + "builddeps": ["build-essential", "cmake", "wget"], "buildcmd": [ "uname -a", + "wget https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0.tar.gz", + "tar xfz cmake-3.14.0.tar.gz", + "cd cmake-3.14.0", + "./bootstrap", + "make -j8", + "cd ..", "mkdir build", "cd build", - "cmake ..", + "../cmake-3.14.0/bin/cmake ..", "make -j8", "ctest -VV -j8" ] From 5e1cae0a7dbcf5d1c6dc5aae2084a38c46d59717 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 24 Mar 2019 08:24:50 +0100 Subject: [PATCH 14/27] :construction_worker: install g++ --- .doozer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.doozer.json b/.doozer.json index 0ba65fdf..6d5b29c8 100644 --- a/.doozer.json +++ b/.doozer.json @@ -32,7 +32,7 @@ }, "centos7-x86_64": { "buildenv": "centos7-x86_64", - "builddeps": ["build-essential", "cmake", "wget"], + "builddeps": ["cmake", "make", "wget", "gcc-g++"], "buildcmd": [ "uname -a", "wget https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0.tar.gz", From 30211477b76d077060571b67f7ee9fdfe1eb826d Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 24 Mar 2019 08:36:01 +0100 Subject: [PATCH 15/27] :construction_worker: fixed package name --- .doozer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.doozer.json b/.doozer.json index 6d5b29c8..a5a507c0 100644 --- a/.doozer.json +++ b/.doozer.json @@ -32,7 +32,7 @@ }, "centos7-x86_64": { "buildenv": "centos7-x86_64", - "builddeps": ["cmake", "make", "wget", "gcc-g++"], + "builddeps": ["cmake", "make", "wget", "gcc-c++"], "buildcmd": [ "uname -a", "wget https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0.tar.gz", From 1e86976cfeceb2575da71e2c39988fd8fe81c11e Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 24 Mar 2019 08:53:30 +0100 Subject: [PATCH 16/27] :construction_worker: fixed paths --- .doozer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.doozer.json b/.doozer.json index a5a507c0..f9b10b9d 100644 --- a/.doozer.json +++ b/.doozer.json @@ -35,15 +35,16 @@ "builddeps": ["cmake", "make", "wget", "gcc-c++"], "buildcmd": [ "uname -a", + "cd", "wget https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0.tar.gz", "tar xfz cmake-3.14.0.tar.gz", "cd cmake-3.14.0", "./bootstrap", "make -j8", - "cd ..", + "cd", "mkdir build", "cd build", - "../cmake-3.14.0/bin/cmake ..", + "../cmake-3.14.0/bin/cmake /project/repo/checkout", "make -j8", "ctest -VV -j8" ] From 842d42b135de2048f580a8378f22c9fc15667392 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 24 Mar 2019 09:02:06 +0100 Subject: [PATCH 17/27] :construction_worker: unified paths --- .doozer.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.doozer.json b/.doozer.json index f9b10b9d..c0e4cdde 100644 --- a/.doozer.json +++ b/.doozer.json @@ -5,15 +5,16 @@ "builddeps": ["build-essential", "cmake", "wget"], "buildcmd": [ "uname -a", + "cd", "wget https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0.tar.gz", "tar xfz cmake-3.14.0.tar.gz", "cd cmake-3.14.0", "./bootstrap", "make -j8", - "cd ..", + "cd", "mkdir build", "cd build", - "../cmake-3.14.0/bin/cmake ..", + "../cmake-3.14.0/bin/cmake /project/repo/checkout", "make -j8", "ctest -VV -j8" ] @@ -23,9 +24,10 @@ "builddeps": ["cmake", "make", "gcc gcc-c++"], "buildcmd": [ "uname -a", + "cd" "mkdir build", "cd build", - "cmake ..", + "cmake /project/repo/checkout", "make -j8", "ctest -VV -j8" ] From dcbc028b5be56f6588ae4ac9286fd01142cc4807 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 24 Mar 2019 09:02:46 +0100 Subject: [PATCH 18/27] :construction_worker: fixed syntax --- .doozer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.doozer.json b/.doozer.json index c0e4cdde..25906879 100644 --- a/.doozer.json +++ b/.doozer.json @@ -24,7 +24,7 @@ "builddeps": ["cmake", "make", "gcc gcc-c++"], "buildcmd": [ "uname -a", - "cd" + "cd", "mkdir build", "cd build", "cmake /project/repo/checkout", From 28dfbedda7fc5df9c6614bbcb1733ace0649a661 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 24 Mar 2019 18:14:59 +0100 Subject: [PATCH 19/27] :construction_worker: fixed timeout --- .doozer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.doozer.json b/.doozer.json index 25906879..af012c34 100644 --- a/.doozer.json +++ b/.doozer.json @@ -16,7 +16,7 @@ "cd build", "../cmake-3.14.0/bin/cmake /project/repo/checkout", "make -j8", - "ctest -VV -j8" + "ctest -VV -j4 --timeout 3000" ] }, "fedora24-x86_64": { From f091fe31bc7ebd2bd30904cbc5723e7405182c8c Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Mon, 25 Mar 2019 06:39:41 +0100 Subject: [PATCH 20/27] :construction_worker: increased timeout --- .doozer.json | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.doozer.json b/.doozer.json index af012c34..db588e4f 100644 --- a/.doozer.json +++ b/.doozer.json @@ -16,7 +16,20 @@ "cd build", "../cmake-3.14.0/bin/cmake /project/repo/checkout", "make -j8", - "ctest -VV -j4 --timeout 3000" + "ctest -VV -j4 --timeout 10000" + ] + }, + "jessie-i386": { + "buildenv": "jessie-i386", + "builddeps": ["cmake", "build-essential"], + "buildcmd": [ + "uname -a", + "cd", + "mkdir build", + "cd build", + "cmake /project/repo/checkout", + "make -j8", + "ctest -VV -j8" ] }, "fedora24-x86_64": { From cde0b243896d1133dc3dff40ef63765c639ccc82 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Mon, 25 Mar 2019 06:43:14 +0100 Subject: [PATCH 21/27] :construction_worker: fixed required packages --- .doozer.json | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.doozer.json b/.doozer.json index db588e4f..0ce54b78 100644 --- a/.doozer.json +++ b/.doozer.json @@ -2,7 +2,7 @@ "targets": { "raspbian-jessie": { "buildenv": "raspbian-jessie", - "builddeps": ["build-essential", "cmake", "wget"], + "builddeps": ["build-essential", "wget"], "buildcmd": [ "uname -a", "cd", @@ -21,13 +21,19 @@ }, "jessie-i386": { "buildenv": "jessie-i386", - "builddeps": ["cmake", "build-essential"], + "builddeps": ["build-essential", "wget"], "buildcmd": [ "uname -a", "cd", + "wget https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0.tar.gz", + "tar xfz cmake-3.14.0.tar.gz", + "cd cmake-3.14.0", + "./bootstrap", + "make -j8", + "cd", "mkdir build", "cd build", - "cmake /project/repo/checkout", + "../cmake-3.14.0/bin/cmake /project/repo/checkout", "make -j8", "ctest -VV -j8" ] @@ -47,7 +53,7 @@ }, "centos7-x86_64": { "buildenv": "centos7-x86_64", - "builddeps": ["cmake", "make", "wget", "gcc-c++"], + "builddeps": ["make", "wget", "gcc-c++"], "buildcmd": [ "uname -a", "cd", From e27b282033bb3a3c2d1b346719931f4d4e34ad18 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Mon, 25 Mar 2019 06:45:35 +0100 Subject: [PATCH 22/27] :construction_worker: skip certificate check --- .doozer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.doozer.json b/.doozer.json index 0ce54b78..1d6dbf4d 100644 --- a/.doozer.json +++ b/.doozer.json @@ -25,7 +25,7 @@ "buildcmd": [ "uname -a", "cd", - "wget https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0.tar.gz", + "wget --no-check-certificate https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0.tar.gz", "tar xfz cmake-3.14.0.tar.gz", "cd cmake-3.14.0", "./bootstrap", From 0a67b51fce56d1b875c9bb743eed384904766e89 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Mon, 25 Mar 2019 07:03:41 +0100 Subject: [PATCH 23/27] :construction_worker: forgot path to ctest --- .doozer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.doozer.json b/.doozer.json index 1d6dbf4d..0a07ce0d 100644 --- a/.doozer.json +++ b/.doozer.json @@ -16,7 +16,7 @@ "cd build", "../cmake-3.14.0/bin/cmake /project/repo/checkout", "make -j8", - "ctest -VV -j4 --timeout 10000" + "../cmake-3.14.0/bin/ctest -VV -j4 --timeout 10000" ] }, "jessie-i386": { @@ -35,7 +35,7 @@ "cd build", "../cmake-3.14.0/bin/cmake /project/repo/checkout", "make -j8", - "ctest -VV -j8" + "../cmake-3.14.0/bin/ctest -VV -j8" ] }, "fedora24-x86_64": { @@ -67,7 +67,7 @@ "cd build", "../cmake-3.14.0/bin/cmake /project/repo/checkout", "make -j8", - "ctest -VV -j8" + "../cmake-3.14.0/bin/ctest -VV -j8" ] } } From af9da22b877b158a5374f40501e08e622b7e3b70 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Mon, 25 Mar 2019 07:15:03 +0100 Subject: [PATCH 24/27] :construction_worker: adding xenial-armhf --- .doozer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.doozer.json b/.doozer.json index 0a07ce0d..134aa2f6 100644 --- a/.doozer.json +++ b/.doozer.json @@ -19,8 +19,8 @@ "../cmake-3.14.0/bin/ctest -VV -j4 --timeout 10000" ] }, - "jessie-i386": { - "buildenv": "jessie-i386", + "xenial-armhf": { + "buildenv": "xenial-armhf", "builddeps": ["build-essential", "wget"], "buildcmd": [ "uname -a", From 9d2f0391e070fa0ded1ec1be3ff8dc09c0465dc0 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Mon, 25 Mar 2019 12:30:45 +0100 Subject: [PATCH 25/27] :construction_worker: fixed timeout --- .doozer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.doozer.json b/.doozer.json index 134aa2f6..48049f40 100644 --- a/.doozer.json +++ b/.doozer.json @@ -35,7 +35,7 @@ "cd build", "../cmake-3.14.0/bin/cmake /project/repo/checkout", "make -j8", - "../cmake-3.14.0/bin/ctest -VV -j8" + "../cmake-3.14.0/bin/ctest -VV -j4 --timeout 10000" ] }, "fedora24-x86_64": { From 099182458457d1b8d37079097cee7005ed66d698 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Tue, 26 Mar 2019 10:41:05 +0100 Subject: [PATCH 26/27] :construction_worker: version output --- .doozer.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.doozer.json b/.doozer.json index 48049f40..687aead8 100644 --- a/.doozer.json +++ b/.doozer.json @@ -5,6 +5,8 @@ "builddeps": ["build-essential", "wget"], "buildcmd": [ "uname -a", + "cat /etc/os-release", + "g++ --version", "cd", "wget https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0.tar.gz", "tar xfz cmake-3.14.0.tar.gz", @@ -24,6 +26,8 @@ "builddeps": ["build-essential", "wget"], "buildcmd": [ "uname -a", + "lsb_release -a", + "g++ --version", "cd", "wget --no-check-certificate https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0.tar.gz", "tar xfz cmake-3.14.0.tar.gz", @@ -43,6 +47,8 @@ "builddeps": ["cmake", "make", "gcc gcc-c++"], "buildcmd": [ "uname -a", + "cat /etc/fedora-release", + "g++ --version", "cd", "mkdir build", "cd build", @@ -56,6 +62,8 @@ "builddeps": ["make", "wget", "gcc-c++"], "buildcmd": [ "uname -a", + "rpm -q centos-release", + "g++ --version", "cd", "wget https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0.tar.gz", "tar xfz cmake-3.14.0.tar.gz", From 24d91cf36f09b598e7e8de4699f9f3152bb325a5 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Tue, 26 Mar 2019 10:49:14 +0100 Subject: [PATCH 27/27] :memo: added Doozer to README --- README.md | 59 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 08fbb14a..53a9c390 100644 --- a/README.md +++ b/README.md @@ -1021,35 +1021,39 @@ Please note: - Unsupported versions of GCC and Clang are rejected by `#error` directives. This can be switched off by defining `JSON_SKIP_UNSUPPORTED_COMPILER_CHECK`. Note that you can expect no support in this case. -The following compilers are currently used in continuous integration at [Travis](https://travis-ci.org/nlohmann/json) and [AppVeyor](https://ci.appveyor.com/project/nlohmann/json): +The following compilers are currently used in continuous integration at [Travis](https://travis-ci.org/nlohmann/json), [AppVeyor](https://ci.appveyor.com/project/nlohmann/json), and [Doozer](https://doozer.io): -| Compiler | Operating System | Version String | -|-----------------|------------------------------|----------------| -| GCC 4.8.5 | Ubuntu 14.04.5 LTS | g++-4.8 (Ubuntu 4.8.5-2ubuntu1~14.04.2) 4.8.5 | -| GCC 4.9.4 | Ubuntu 14.04.1 LTS | g++-4.9 (Ubuntu 4.9.4-2ubuntu1~14.04.1) 4.9.4 | -| GCC 5.5.0 | Ubuntu 14.04.1 LTS | g++-5 (Ubuntu 5.5.0-12ubuntu1~14.04) 5.5.0 20171010 | -| GCC 6.4.0 | Ubuntu 14.04.1 LTS | g++-6 (Ubuntu 6.4.0-17ubuntu1~14.04) 6.4.0 20180424 | -| GCC 7.3.0 | Ubuntu 14.04.1 LTS | g++-7 (Ubuntu 7.3.0-21ubuntu1~14.04) 7.3.0 | -| GCC 7.3.0 | Windows Server 2012 R2 (x64) | g++ (x86_64-posix-seh-rev0, Built by MinGW-W64 project) 7.3.0 | -| GCC 8.1.0 | Ubuntu 14.04.1 LTS | g++-8 (Ubuntu 8.1.0-5ubuntu1~14.04) 8.1.0 | -| Clang 3.5.0 | Ubuntu 14.04.1 LTS | clang version 3.5.0-4ubuntu2~trusty2 (tags/RELEASE_350/final) (based on LLVM 3.5.0) | -| Clang 3.6.2 | Ubuntu 14.04.1 LTS | clang version 3.6.2-svn240577-1~exp1 (branches/release_36) (based on LLVM 3.6.2) | -| Clang 3.7.1 | Ubuntu 14.04.1 LTS | clang version 3.7.1-svn253571-1~exp1 (branches/release_37) (based on LLVM 3.7.1) | -| Clang 3.8.0 | Ubuntu 14.04.1 LTS | clang version 3.8.0-2ubuntu3~trusty5 (tags/RELEASE_380/final) | -| Clang 3.9.1 | Ubuntu 14.04.1 LTS | clang version 3.9.1-4ubuntu3~14.04.3 (tags/RELEASE_391/rc2) | -| Clang 4.0.1 | Ubuntu 14.04.1 LTS | clang version 4.0.1-svn305264-1~exp1 (branches/release_40) | -| Clang 5.0.2 | Ubuntu 14.04.1 LTS | clang version 5.0.2-svn328729-1~exp1~20180509123505.100 (branches/release_50) | -| Clang 6.0.1 | Ubuntu 14.04.1 LTS | clang version 6.0.1-svn334776-1~exp1~20180726133705.85 (branches/release_60) | -| Clang 7.0.1 | Ubuntu 14.04.1 LTS | clang version 7.0.1-svn348686-1~exp1~20181213084532.54 (branches/release_70) | -| Clang Xcode 8.3 | OSX 10.11.6 | Apple LLVM version 8.1.0 (clang-802.0.38) | -| Clang Xcode 9.0 | OSX 10.12.6 | Apple LLVM version 9.0.0 (clang-900.0.37) | -| Clang Xcode 9.1 | OSX 10.12.6 | Apple LLVM version 9.0.0 (clang-900.0.38) | -| Clang Xcode 9.2 | OSX 10.13.3 | Apple LLVM version 9.1.0 (clang-902.0.39.1) | -| Clang Xcode 9.3 | OSX 10.13.3 | Apple LLVM version 9.1.0 (clang-902.0.39.2) | -| Clang Xcode 10.0 | OSX 10.13.3 | Apple LLVM version 10.0.0 (clang-1000.11.45.2) | -| Clang Xcode 10.1 | OSX 10.13.3 | Apple LLVM version 10.0.0 (clang-1000.11.45.5) | +| Compiler | Operating System | Version String | +|-----------------------|------------------------------|----------------| +| GCC 4.8.5 | Ubuntu 14.04.5 LTS | g++-4.8 (Ubuntu 4.8.5-2ubuntu1~14.04.2) 4.8.5 | +| GCC 4.8.5 | CentOS Release-7-6.1810.2.el7.centos.x86_64 | g++ (GCC) 4.8.5 20150623 (Red Hat 4.8.5-36) | +| GCC 4.9.2 (armv7l) | Raspbian GNU/Linux 8 (jessie) | g++ (Raspbian 4.9.2-10+deb8u2) 4.9.2 | +| GCC 4.9.4 | Ubuntu 14.04.1 LTS | g++-4.9 (Ubuntu 4.9.4-2ubuntu1~14.04.1) 4.9.4 | +| GCC 5.3.1 (armv7l) | Ubuntu 16.04 LTS | g++ (Ubuntu/Linaro 5.3.1-14ubuntu2) 5.3.1 20160413 | +| GCC 5.5.0 | Ubuntu 14.04.1 LTS | g++-5 (Ubuntu 5.5.0-12ubuntu1~14.04) 5.5.0 20171010 | +| GCC 6.3.1 | Fedora release 24 (Twenty Four) | g++ (GCC) 6.3.1 20161221 (Red Hat 6.3.1-1) | +| GCC 6.4.0 | Ubuntu 14.04.1 LTS | g++-6 (Ubuntu 6.4.0-17ubuntu1~14.04) 6.4.0 20180424 | +| GCC 7.3.0 | Ubuntu 14.04.1 LTS | g++-7 (Ubuntu 7.3.0-21ubuntu1~14.04) 7.3.0 | +| GCC 7.3.0 | Windows Server 2012 R2 (x64) | g++ (x86_64-posix-seh-rev0, Built by MinGW-W64 project) 7.3.0 | +| GCC 8.1.0 | Ubuntu 14.04.1 LTS | g++-8 (Ubuntu 8.1.0-5ubuntu1~14.04) 8.1.0 | +| Clang 3.5.0 | Ubuntu 14.04.1 LTS | clang version 3.5.0-4ubuntu2~trusty2 (tags/RELEASE_350/final) (based on LLVM 3.5.0) | +| Clang 3.6.2 | Ubuntu 14.04.1 LTS | clang version 3.6.2-svn240577-1~exp1 (branches/release_36) (based on LLVM 3.6.2) | +| Clang 3.7.1 | Ubuntu 14.04.1 LTS | clang version 3.7.1-svn253571-1~exp1 (branches/release_37) (based on LLVM 3.7.1) | +| Clang 3.8.0 | Ubuntu 14.04.1 LTS | clang version 3.8.0-2ubuntu3~trusty5 (tags/RELEASE_380/final) | +| Clang 3.9.1 | Ubuntu 14.04.1 LTS | clang version 3.9.1-4ubuntu3~14.04.3 (tags/RELEASE_391/rc2) | +| Clang 4.0.1 | Ubuntu 14.04.1 LTS | clang version 4.0.1-svn305264-1~exp1 (branches/release_40) | +| Clang 5.0.2 | Ubuntu 14.04.1 LTS | clang version 5.0.2-svn328729-1~exp1~20180509123505.100 (branches/release_50) | +| Clang 6.0.1 | Ubuntu 14.04.1 LTS | clang version 6.0.1-svn334776-1~exp1~20180726133705.85 (branches/release_60) | +| Clang 7.0.1 | Ubuntu 14.04.1 LTS | clang version 7.0.1-svn348686-1~exp1~20181213084532.54 (branches/release_70) | +| Clang Xcode 8.3 | OSX 10.11.6 | Apple LLVM version 8.1.0 (clang-802.0.38) | +| Clang Xcode 9.0 | OSX 10.12.6 | Apple LLVM version 9.0.0 (clang-900.0.37) | +| Clang Xcode 9.1 | OSX 10.12.6 | Apple LLVM version 9.0.0 (clang-900.0.38) | +| Clang Xcode 9.2 | OSX 10.13.3 | Apple LLVM version 9.1.0 (clang-902.0.39.1) | +| Clang Xcode 9.3 | OSX 10.13.3 | Apple LLVM version 9.1.0 (clang-902.0.39.2) | +| Clang Xcode 10.0 | OSX 10.13.3 | Apple LLVM version 10.0.0 (clang-1000.11.45.2) | +| Clang Xcode 10.1 | OSX 10.13.3 | Apple LLVM version 10.0.0 (clang-1000.11.45.5) | | Visual Studio 14 2015 | Windows Server 2012 R2 (x64) | Microsoft (R) Build Engine version 14.0.25420.1, MSVC 19.0.24215.1 | -| Visual Studio 2017 | Windows Server 2016 | Microsoft (R) Build Engine version 15.7.180.61344, MSVC 19.14.26433.0 | +| Visual Studio 2017 | Windows Server 2016 | Microsoft (R) Build Engine version 15.7.180.61344, MSVC 19.14.26433.0 | ## License @@ -1273,6 +1277,7 @@ The library itself consists of a single header file licensed under the MIT licen - [**Coveralls**](https://coveralls.io) to measure [code coverage](https://coveralls.io/github/nlohmann/json) - [**Coverity Scan**](https://scan.coverity.com) for [static analysis](https://scan.coverity.com/projects/nlohmann-json) - [**cppcheck**](http://cppcheck.sourceforge.net) for static analysis +- [**Doozer**](https://doozer.io) for [continuous integration](https://doozer.io/nlohmann/json) on Linux (CentOS, Raspbian, Fedora) - [**Doxygen**](http://www.stack.nl/~dimitri/doxygen/) to generate [documentation](https://nlohmann.github.io/json/) - [**git-update-ghpages**](https://github.com/rstacruz/git-update-ghpages) to upload the documentation to gh-pages - [**GitHub Changelog Generator**](https://github.com/skywinder/github-changelog-generator) to generate the [ChangeLog](https://github.com/nlohmann/json/blob/develop/ChangeLog.md)