From 6529bb1657c21ad2f33bf1d8ec87cb8e3093cc53 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Mon, 5 Oct 2020 06:14:06 +0000 Subject: [PATCH 01/10] add gcc 48 test --- .github/workflows/ci.yml | 15 +++++++++++++++ ci/do_ci.sh | 10 ++++++++++ 2 files changed, 25 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c277027419..8ef5204bf7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,6 +21,21 @@ jobs: - name: run prometheus exporter tests run: ./ci/do_ci.sh cmake.exporter.prometheus.test + cmake_gcc_48_test: + name: Legacy CMake + runs-on: ubuntu-18.04 + steps: + - uses: actions/checkout@v2 + - name: setup + run: | + sudo ./ci/setup_ci_environment.sh + sudo ./ci/setup_cmake.sh + sudo ./ci/install_gcc48.sh + - name: run tests + run: ./ci/do_ci.sh cmake.legacy.test + env: + CC: /usr/bin/gcc-4.8 + CXX: /usr/bin/g++-4.8 cmake_test_cxx20: name: CMake C++20 test runs-on: ubuntu-20.04 diff --git a/ci/do_ci.sh b/ci/do_ci.sh index 493e31f554..94a00f833b 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -30,6 +30,16 @@ elif [[ "$1" == "cmake.c++20.test" ]]; then make make test exit 0 +elif [[ "$1" == "cmake.legacy.test" ]]; then + cd "${BUILD_DIR}" + rm -rf * + cmake -DCMAKE_BUILD_TYPE=Debug \ + -DCMAKE_CXX_FLAGS="-Werror" \ + -DCMAKE_CXX_STANDARD=11 \ + "${SRC_DIR}" + make + make test + exit 0; elif [[ "$1" == "cmake.exporter.otprotocol.test" ]]; then cd "${BUILD_DIR}" rm -rf * From 767efcf83e58c33139dcce04342537158f9f538c Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Mon, 5 Oct 2020 17:52:17 +0000 Subject: [PATCH 02/10] add gcc4.8 test --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ef5204bf7..8c0fb61ba3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,6 +31,9 @@ jobs: sudo ./ci/setup_ci_environment.sh sudo ./ci/setup_cmake.sh sudo ./ci/install_gcc48.sh + env: + CC: /usr/bin/gcc-4.8 + CXX: /usr/bin/g++-4.8 - name: run tests run: ./ci/do_ci.sh cmake.legacy.test env: From 84090089ce8c485c2c529a7844d7c0283b384999 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Mon, 5 Oct 2020 17:54:47 +0000 Subject: [PATCH 03/10] fix formt --- ci/do_ci.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/do_ci.sh b/ci/do_ci.sh index 94a00f833b..66fad6ef05 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -35,8 +35,8 @@ elif [[ "$1" == "cmake.legacy.test" ]]; then rm -rf * cmake -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_CXX_FLAGS="-Werror" \ - -DCMAKE_CXX_STANDARD=11 \ - "${SRC_DIR}" + -DCMAKE_CXX_STANDARD=11 \ + "${SRC_DIR}" make make test exit 0; From 7ed506cdcc45256df9e09a80b289786daaa5b0d5 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Mon, 5 Oct 2020 18:01:36 +0000 Subject: [PATCH 04/10] format --- ci/setup_cmake.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/setup_cmake.sh b/ci/setup_cmake.sh index 5693064c65..1423459840 100755 --- a/ci/setup_cmake.sh +++ b/ci/setup_cmake.sh @@ -21,6 +21,7 @@ set -e # Follows these instructions for setting up gtest # https://www.eriksmistad.no/getting-started-with-google-test-on-ubuntu/ pushd /usr/src/gtest +echo $CC." -- ".$CXX cmake CMakeLists.txt make cp *.a /usr/lib || cp lib/*.a /usr/lib From ff49f08e88c760c17d899d8316df7e9958cc7091 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Mon, 5 Oct 2020 18:18:12 +0000 Subject: [PATCH 05/10] fix cmake --- .github/workflows/ci.yml | 4 +++- ci/setup_cmake.sh | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8c0fb61ba3..ef7c5c3052 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,8 +29,10 @@ jobs: - name: setup run: | sudo ./ci/setup_ci_environment.sh - sudo ./ci/setup_cmake.sh sudo ./ci/install_gcc48.sh + - name: setup cmake + run: | + sudo ./ci/setup_cmake.sh env: CC: /usr/bin/gcc-4.8 CXX: /usr/bin/g++-4.8 diff --git a/ci/setup_cmake.sh b/ci/setup_cmake.sh index 1423459840..5693064c65 100755 --- a/ci/setup_cmake.sh +++ b/ci/setup_cmake.sh @@ -21,7 +21,6 @@ set -e # Follows these instructions for setting up gtest # https://www.eriksmistad.no/getting-started-with-google-test-on-ubuntu/ pushd /usr/src/gtest -echo $CC." -- ".$CXX cmake CMakeLists.txt make cp *.a /usr/lib || cp lib/*.a /usr/lib From 287a600ed1e2c2d9a9b76aad8dc92c4546ea7882 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Mon, 5 Oct 2020 18:35:05 +0000 Subject: [PATCH 06/10] fix enx --- .github/workflows/ci.yml | 5 +---- ci/setup_cmake.sh | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ef7c5c3052..6b7078e5e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,10 +32,7 @@ jobs: sudo ./ci/install_gcc48.sh - name: setup cmake run: | - sudo ./ci/setup_cmake.sh - env: - CC: /usr/bin/gcc-4.8 - CXX: /usr/bin/g++-4.8 + sudo CC=usr/bin/gcc-4.8 CXX=/usr/bin/g++-4.8 ./ci/setup_cmake.sh - name: run tests run: ./ci/do_ci.sh cmake.legacy.test env: diff --git a/ci/setup_cmake.sh b/ci/setup_cmake.sh index 5693064c65..7051425f37 100755 --- a/ci/setup_cmake.sh +++ b/ci/setup_cmake.sh @@ -20,6 +20,7 @@ set -e # Follows these instructions for setting up gtest # https://www.eriksmistad.no/getting-started-with-google-test-on-ubuntu/ +echo $CC."--"$CXX pushd /usr/src/gtest cmake CMakeLists.txt make From c4e92800f49f1c6c98434a8018bd4c7a21c709fa Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Mon, 5 Oct 2020 18:39:23 +0000 Subject: [PATCH 07/10] fix gcc path --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b7078e5e2..254fb4358b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: sudo ./ci/install_gcc48.sh - name: setup cmake run: | - sudo CC=usr/bin/gcc-4.8 CXX=/usr/bin/g++-4.8 ./ci/setup_cmake.sh + sudo CC=/usr/bin/gcc-4.8 CXX=/usr/bin/g++-4.8 ./ci/setup_cmake.sh - name: run tests run: ./ci/do_ci.sh cmake.legacy.test env: From 705eff672c0da5f9ea57b2f9c0ed49e6b266bbf6 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Mon, 5 Oct 2020 18:41:48 +0000 Subject: [PATCH 08/10] revert debug --- ci/setup_cmake.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/setup_cmake.sh b/ci/setup_cmake.sh index 7051425f37..5693064c65 100755 --- a/ci/setup_cmake.sh +++ b/ci/setup_cmake.sh @@ -20,7 +20,6 @@ set -e # Follows these instructions for setting up gtest # https://www.eriksmistad.no/getting-started-with-google-test-on-ubuntu/ -echo $CC."--"$CXX pushd /usr/src/gtest cmake CMakeLists.txt make From 3c3a23f0cbd243ea21babd193130c781e5ffdc4b Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Tue, 6 Oct 2020 07:16:10 +0000 Subject: [PATCH 09/10] fix test name --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 254fb4358b..cb2bb26841 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: run: ./ci/do_ci.sh cmake.exporter.prometheus.test cmake_gcc_48_test: - name: Legacy CMake + name: CMake gcc 4.8 runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 @@ -38,6 +38,7 @@ jobs: env: CC: /usr/bin/gcc-4.8 CXX: /usr/bin/g++-4.8 + cmake_test_cxx20: name: CMake C++20 test runs-on: ubuntu-20.04 From 2d14ecb11680cb976c9b5f0433c087acd4b5384e Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Tue, 6 Oct 2020 07:19:18 +0000 Subject: [PATCH 10/10] fix semicolon --- ci/do_ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/do_ci.sh b/ci/do_ci.sh index 66fad6ef05..4790daabf5 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -39,7 +39,7 @@ elif [[ "$1" == "cmake.legacy.test" ]]; then "${SRC_DIR}" make make test - exit 0; + exit 0 elif [[ "$1" == "cmake.exporter.otprotocol.test" ]]; then cd "${BUILD_DIR}" rm -rf *