Ubuntu 22.04 (#262)

* Apply patch for non-constant SIGSTKSZ See https://src.fedoraproject.org/rpms/catch1/blob/rawhide/f/catch1-sigstksz.patch * Try Ubuntu 22.04 * Don't set CMAKE_CXX_STANDARD * Try Ubuntu 22.04 * Document Ubuntu 22.04
sony · May 23, 2022 · 1118aa4 · 1118aa4
1 parent dff1585
commit 1118aa4
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 17 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -44,6 +44,11 @@ jobs:
             use_conan: true
             force_cpprest_asio: true
             dns_sd_mode: multicast
+          - os: ubuntu-22.04
+            install_mdns: false
+            use_conan: true
+            force_cpprest_asio: false
+            dns_sd_mode: multicast
 
     steps:
     - uses: actions/checkout@v2
@@ -1062,4 +1067,4 @@ jobs:
         git config --global user.name 'test-results-uploader'
         git config --global user.email 'test-results-uploader@nmos-cpp.iam.gserviceaccount.com'
         git commit -qm "Badges for README at ${{ env.GITHUB_COMMIT }}"
-        git push -f `git remote` badges-${{ env.GITHUB_COMMIT }}:badges
+        git push -f `git remote` badges-${{ env.GITHUB_COMMIT }}:badges
diff --git a/.github/workflows/src/build-test.yml b/.github/workflows/src/build-test.yml
@@ -44,6 +44,11 @@ jobs:
             use_conan: true
             force_cpprest_asio: true
             dns_sd_mode: multicast
+          - os: ubuntu-22.04
+            install_mdns: false
+            use_conan: true
+            force_cpprest_asio: false
+            dns_sd_mode: multicast
 
     steps:
     - uses: actions/checkout@v2

diff --git a/Development/cmake/NmosCppCommon.cmake b/Development/cmake/NmosCppCommon.cmake
@@ -17,11 +17,9 @@ if(WIN32)
     string(APPEND NMOS_CPP_INSTALL_BINDIR "/$<IF:$<CONFIG:Debug>,Debug,Release>")
 endif()
 
-# enable C++11
+# enable C++
 enable_language(CXX)
-if(NOT DEFINED CMAKE_CXX_STANDARD)
-    set(CMAKE_CXX_STANDARD 11)
-endif()
+# check C++11 or higher
 if(CMAKE_CXX_STANDARD STREQUAL "98")
     message(FATAL_ERROR "CMAKE_CXX_STANDARD must be 11 or higher; C++98 is not supported")
 endif()

diff --git a/Development/third_party/catch/catch.hpp b/Development/third_party/catch/catch.hpp
@@ -6468,7 +6468,7 @@ namespace Catch {
         static bool isSet;
         static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)];
         static stack_t oldSigStack;
-        static char altStackMem[SIGSTKSZ];
+        static char altStackMem[32768];
 
         static void handleSignal( int sig ) {
             std::string name = "<unknown signal>";
@@ -6488,7 +6488,7 @@ namespace Catch {
             isSet = true;
             stack_t sigStack;
             sigStack.ss_sp = altStackMem;
-            sigStack.ss_size = SIGSTKSZ;
+            sigStack.ss_size = 32768;
             sigStack.ss_flags = 0;
             sigaltstack(&sigStack, &oldSigStack);
             struct sigaction sa = { 0 };
@@ -6519,7 +6519,7 @@ namespace Catch {
     bool FatalConditionHandler::isSet = false;
     struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {};
     stack_t FatalConditionHandler::oldSigStack = {};
-    char FatalConditionHandler::altStackMem[SIGSTKSZ] = {};
+    char FatalConditionHandler::altStackMem[32768] = {};
 
 } // namespace Catch
 

diff --git a/README.md b/README.md
@@ -52,15 +52,16 @@ Several vendors have deployed JT-NM Tested badged products, using nmos-cpp, to t
 
 The following configurations, defined by the [build-test](.github/workflows/src/build-test.yml) jobs, are built and unit tested automatically via continuous integration.
 
-| Platform | Version                  | Build Options                      | Test Options                               |
-|----------|--------------------------|------------------------------------|--------------------------------------------|
-| Linux    | Ubuntu 20.04 (GCC 9.4.0) | Avahi                              | Secure Communications, Multicast DNS-SD    |
-| Linux    | Ubuntu 20.04 (GCC 9.4.0) | Avahi                              | Secure Communications, Unicast DNS-SD      |
-| Linux    | Ubuntu 20.04 (GCC 9.4.0) | mDNSResponder                      | Secure Communications, Multicast DNS-SD    |
-| Linux    | Ubuntu 14.04 (GCC 4.8.4) | mDNSResponder, not using Conan     | Secure Communications, Multicast DNS-SD    |
-| Windows  | Server 2019 (VS 2019)    | Bonjour (mDNSResponder), WinHTTP   | Secure Communications, Multicast DNS-SD    |
-| Windows  | Server 2019 (VS 2019)    | Bonjour (mDNSResponder), ASIO      | Secure Communications, Multicast DNS-SD    |
-| macOS    | 11 (AppleClang 13.0)     | Bonjour (mDNSResponder)            | Secure Communications, Multicast DNS-SD    |
+| Platform | Version                   | Build Options                      | Test Options                               |
+|----------|---------------------------|------------------------------------|--------------------------------------------|
+| Linux    | Ubuntu 22.04 (GCC 11.2.0) | Avahi                              | Secure Communications<br/>Multicast DNS-SD |
+| Linux    | Ubuntu 20.04 (GCC 9.4.0)  | Avahi                              | Secure Communications<br/>Multicast DNS-SD |
+| Linux    | Ubuntu 20.04 (GCC 9.4.0)  | Avahi                              | Secure Communications<br/>Unicast DNS-SD   |
+| Linux    | Ubuntu 20.04 (GCC 9.4.0)  | mDNSResponder                      | Secure Communications<br/>Multicast DNS-SD |
+| Linux    | Ubuntu 14.04 (GCC 4.8.4)  | mDNSResponder, not using Conan     | Secure Communications<br/>Multicast DNS-SD |
+| Windows  | Server 2019 (VS 2019)     | Bonjour (mDNSResponder), WinHTTP   | Secure Communications<br/>Multicast DNS-SD |
+| Windows  | Server 2019 (VS 2019)     | Bonjour (mDNSResponder), ASIO      | Secure Communications<br/>Multicast DNS-SD |
+| macOS    | 11 (AppleClang 13.0)      | Bonjour (mDNSResponder)            | Secure Communications<br/>Multicast DNS-SD |
 
 The [AMWA NMOS API Testing Tool](https://github.com/AMWA-TV/nmos-testing) is automatically run against the APIs of the **nmos-cpp-node** and **nmos-cpp-registry** applications.