From a63317b483095b539483340706a33deea670b879 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Fri, 22 Dec 2023 08:03:53 +0100 Subject: [PATCH 1/9] update readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 970c7c1..7f50983 100644 --- a/README.md +++ b/README.md @@ -146,6 +146,7 @@ The testing framwework used is Google Test. # 5. Version History ## 5.1. Version 1.0 +- [**Improvement**] Add support for newer libGPS ([#39](https://github.com/F4FXL/DStarGateway/issues/39)) - [**Bugfix**] Fix #37 Unable to transmit multiple files (DGWVoiceTransmit) ([#37](https://github.com/F4FXL/DStarGateway/issues/37)) - [**Bugfix**] Fix #36 Error1 Build fails in some environment ([#36](https://github.com/F4FXL/DStarGateway/issues/36)) - [**Bugfix**] Fix #38 g++ 13 build ([#38](https://github.com/F4FXL/DStarGateway/issues/38)) From 93b1b1fa45db658be94a4e26eedf1198d848118c Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Fri, 22 Dec 2023 08:40:36 +0100 Subject: [PATCH 2/9] #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 3/9] #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 4/9] #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 From 2274d94191ed65ef3beeda69e4fcad1fc268b2e9 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Fri, 22 Dec 2023 09:54:15 +0100 Subject: [PATCH 5/9] update readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7f50983..4ad3770 100644 --- a/README.md +++ b/README.md @@ -146,6 +146,7 @@ The testing framwework used is Google Test. # 5. Version History ## 5.1. Version 1.0 +- [**Improvement**] Improve CI to include all variants of build configurations ([#40](https://github.com/F4FXL/DStarGateway/issues/40)) - [**Improvement**] Add support for newer libGPS ([#39](https://github.com/F4FXL/DStarGateway/issues/39)) - [**Bugfix**] Fix #37 Unable to transmit multiple files (DGWVoiceTransmit) ([#37](https://github.com/F4FXL/DStarGateway/issues/37)) - [**Bugfix**] Fix #36 Error1 Build fails in some environment ([#36](https://github.com/F4FXL/DStarGateway/issues/36)) From d2f90d83fe0c89de957e321da942bd1bcd4853df Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Fri, 22 Dec 2023 14:42:11 +0100 Subject: [PATCH 6/9] update readme --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 4ad3770..4c51662 100644 --- a/README.md +++ b/README.md @@ -147,7 +147,6 @@ The testing framwework used is Google Test. # 5. Version History ## 5.1. Version 1.0 - [**Improvement**] Improve CI to include all variants of build configurations ([#40](https://github.com/F4FXL/DStarGateway/issues/40)) -- [**Improvement**] Add support for newer libGPS ([#39](https://github.com/F4FXL/DStarGateway/issues/39)) - [**Bugfix**] Fix #37 Unable to transmit multiple files (DGWVoiceTransmit) ([#37](https://github.com/F4FXL/DStarGateway/issues/37)) - [**Bugfix**] Fix #36 Error1 Build fails in some environment ([#36](https://github.com/F4FXL/DStarGateway/issues/36)) - [**Bugfix**] Fix #38 g++ 13 build ([#38](https://github.com/F4FXL/DStarGateway/issues/38)) From 0058cc5eb263362f4d322bd61c36107538647106 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Fri, 22 Dec 2023 16:02:05 +0100 Subject: [PATCH 7/9] typo in redeme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4c51662..cfdf026 100644 --- a/README.md +++ b/README.md @@ -175,11 +175,11 @@ The testing framwework used is Google Test. - [**Bugfix**] Trying to connect to ghost ircDDB when no ircDDB is configured ## 5.5. Version 0.4 - [**Improvement**] Add APRS status link feature ([#8](https://github.com/F4FXL/DStarGateway/issues/8)) -- [**Bugfix**] Posotions received over radio were not sent to APRS-IS when GPDS connection failed. ([#7](https://github.com/F4FXL/DStarGateway/issues/7)) +- [**Bugfix**] Positions received over radio were not sent to APRS-IS when GPDS connection failed. ([#7](https://github.com/F4FXL/DStarGateway/issues/7)) - [**Improvement**] Bring back GPSD support ([#6](https://github.com/F4FXL/DStarGateway/issues/6)) - [**Improvement**] Log enhancements ([#4](https://github.com/F4FXL/DStarGateway/issues/4)) ## 5.6. Version 0.3 -- [**Improvement**] Get ride of libcongig++ dependency. When upgrading from earlier version you need to manualy delete the config file before reinstalling. +- [**Improvement**] Get ride of libconfig++ dependency. When upgrading from earlier version you need to manualy delete the config file before reinstalling. ## 5.7. Version 0.2 - [**Bugfix**] ircDDBFreeze when repeater not found ([#1](https://github.com/F4FXL/DStarGateway/issues/1)) - Code sanitization From 59d47f33f77c2e8a95d825682c9f9e7ac3d4964e Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Fri, 22 Dec 2023 16:02:37 +0100 Subject: [PATCH 8/9] again typo in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cfdf026..5cbcbe9 100644 --- a/README.md +++ b/README.md @@ -179,7 +179,7 @@ The testing framwework used is Google Test. - [**Improvement**] Bring back GPSD support ([#6](https://github.com/F4FXL/DStarGateway/issues/6)) - [**Improvement**] Log enhancements ([#4](https://github.com/F4FXL/DStarGateway/issues/4)) ## 5.6. Version 0.3 -- [**Improvement**] Get ride of libconfig++ dependency. When upgrading from earlier version you need to manualy delete the config file before reinstalling. +- [**Improvement**] Get rid of libconfig++ dependency. When upgrading from earlier version you need to manualy delete the config file before reinstalling. ## 5.7. Version 0.2 - [**Bugfix**] ircDDBFreeze when repeater not found ([#1](https://github.com/F4FXL/DStarGateway/issues/1)) - Code sanitization From 7a485a844f5f078fe5db49865b30230903b046d2 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Fri, 22 Dec 2023 16:03:38 +0100 Subject: [PATCH 9/9] typo readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5cbcbe9..29da11f 100644 --- a/README.md +++ b/README.md @@ -150,7 +150,7 @@ The testing framwework used is Google Test. - [**Bugfix**] Fix #37 Unable to transmit multiple files (DGWVoiceTransmit) ([#37](https://github.com/F4FXL/DStarGateway/issues/37)) - [**Bugfix**] Fix #36 Error1 Build fails in some environment ([#36](https://github.com/F4FXL/DStarGateway/issues/36)) - [**Bugfix**] Fix #38 g++ 13 build ([#38](https://github.com/F4FXL/DStarGateway/issues/38)) -- [**Bugfix**] Add support for libgps API version greater than ([#39](https://github.com/F4FXL/DStarGateway/issues/39)) +- [**Bugfix**] Add support for libgps API version greater than 10([#39](https://github.com/F4FXL/DStarGateway/issues/39)) ## 5.2. Version 0.7 - [**Bugfix**] Unknow repeater entries in log when using Icom Hardware ([#34](https://github.com/F4FXL/DStarGateway/issues/34)) - [**Bugfix**] Malformed callsign in some cases when using DV-G (NMEA) ([#33](https://github.com/F4FXL/DStarGateway/issues/33))