From 93b1b1fa45db658be94a4e26eedf1198d848118c Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Fri, 22 Dec 2023 08:40:36 +0100 Subject: [PATCH 1/3] #40 Fix building with debug enabled set to false --- Common/DRATSServer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/DRATSServer.cpp b/Common/DRATSServer.cpp index d83bbc4..38954f1 100644 --- a/Common/DRATSServer.cpp +++ b/Common/DRATSServer.cpp @@ -339,7 +339,7 @@ void* CDRATSServer::Entry() } catch (std::exception& e) { std::string message(e.what()); - CLog::logError("Exception raised in the D-RATS Server thread - \"%s\""), message.c_str(); + CLog::logError("Exception raised in the D-RATS Server thread - \"%s\"", message.c_str()); } catch (...) { CLog::logError("Unknown exception raised in the D-RATS Server thread"); From 306a529f4cd232ff4c3c3f78b322f791c33f2723 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Fri, 22 Dec 2023 08:49:30 +0100 Subject: [PATCH 2/3] #40 improve ci to include all variants of build configurations --- .circleci/config.yml | 74 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 71 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f858990..22bb586 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ version: 2.1 # Define a job to be invoked later in a workflow. # See: https://circleci.com/docs/2.0/configuration-reference/#jobs jobs: - build-dstargateway: + build-dstargateway-debug-gps: # Specify the execution environment. You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub. # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor docker: @@ -21,13 +21,81 @@ jobs: sudo apt-get -y install libgtest-dev libcurl4-openssl-dev libboost-dev libgps-dev - run: name: "Build" - command: "make -j 3 ENABLE_DEBUG=1 USE_GPSD=1" + command: "make ENABLE_DEBUG=1 USE_GPSD=1" - run: name: "Run Tests" command: "make run-tests ENABLE_DEBUG=1 USE_GPSD=1" + + build-dstargateway-gps: + # Specify the execution environment. You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub. + # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor + docker: + - image: cimg/base:stable + # Add steps to the job + # See: https://circleci.com/docs/2.0/configuration-reference/#steps + steps: + - checkout + - run: + name: Install dependencies + command: | + sudo apt-get update + sudo apt-get -y install libgtest-dev libcurl4-openssl-dev libboost-dev libgps-dev + - run: + name: "Build" + command: "make USE_GPSD=1" + - run: + name: "Run Tests" + command: "make run-tests USE_GPSD=1" + + build-dstargateway-debug: + # Specify the execution environment. You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub. + # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor + docker: + - image: cimg/base:stable + # Add steps to the job + # See: https://circleci.com/docs/2.0/configuration-reference/#steps + steps: + - checkout + - run: + name: Install dependencies + command: | + sudo apt-get update + sudo apt-get -y install libgtest-dev libcurl4-openssl-dev libboost-dev + - run: + name: "Build" + command: "make ENABLE_DEBUG=1" + - run: + name: "Run Tests" + command: "make run-tests ENABLE_DEBUG=1" + + build-dstargateway-noopt: + # Specify the execution environment. You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub. + # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor + docker: + - image: cimg/base:stable + # Add steps to the job + # See: https://circleci.com/docs/2.0/configuration-reference/#steps + steps: + - checkout + - run: + name: Install dependencies + command: | + sudo apt-get update + sudo apt-get -y install libgtest-dev libcurl4-openssl-dev libboost-dev + - run: + name: "Build" + command: "make" + - run: + name: "Run Tests" + command: "make run-tests ENABLE_DEBUG=1 USE_GPSD=1" + # Invoke jobs via workflows # See: https://circleci.com/docs/2.0/configuration-reference/#workflows workflows: dstar-gateway-workflow: jobs: - - build-dstargateway + - build-dstargateway-debug-gps + - build-dstargateway-gps + - build-dstargateway-debug + - build-dstargateway-noopt + From 0109280758d6555c6551b68d4b57d9c1249fea38 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Fri, 22 Dec 2023 09:12:09 +0100 Subject: [PATCH 3/3] #40 correct noopt build --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 22bb586..b5756e3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -87,7 +87,7 @@ jobs: command: "make" - run: name: "Run Tests" - command: "make run-tests ENABLE_DEBUG=1 USE_GPSD=1" + command: "make run-tests" # Invoke jobs via workflows # See: https://circleci.com/docs/2.0/configuration-reference/#workflows