From 702b0a08d9353ce322d803f7467318c25751f905 Mon Sep 17 00:00:00 2001
From: alanb-sony <62992435+alanb-sony@users.noreply.github.com>
Date: Tue, 30 Jul 2024 14:55:01 +0100
Subject: [PATCH 1/2] Workaround GCC 10&11 optimiser compilation failure

---
 Development/cpprest/json_ops.h | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/Development/cpprest/json_ops.h b/Development/cpprest/json_ops.h
index 2dfda54f..a1021d51 100644
--- a/Development/cpprest/json_ops.h
+++ b/Development/cpprest/json_ops.h
@@ -51,12 +51,7 @@ namespace web
             return !(lhs == rhs);
         }
 
-        inline bool operator<(const web::json::object& lhs, const web::json::object& rhs)
-        {
-            using std::begin;
-            using std::end;
-            return std::lexicographical_compare(begin(lhs), end(lhs), begin(rhs), end(rhs));
-        }
+        inline bool operator<(const web::json::object& lhs, const web::json::object& rhs);
 
         inline bool operator>(const web::json::object& lhs, const web::json::object& rhs)
         {
@@ -87,12 +82,7 @@ namespace web
             return !(lhs == rhs);
         }
 
-        inline bool operator<(const web::json::array& lhs, const web::json::array& rhs)
-        {
-            using std::begin;
-            using std::end;
-            return std::lexicographical_compare(begin(lhs), end(lhs), begin(rhs), end(rhs));
-        }
+        inline bool operator<(const web::json::array& lhs, const web::json::array& rhs);
 
         inline bool operator>(const web::json::array& lhs, const web::json::array& rhs)
         {
@@ -142,6 +132,20 @@ namespace web
         {
             return !(lhs < rhs);
         }
+
+        inline bool operator<(const web::json::array& lhs, const web::json::array& rhs)
+        {
+            using std::begin;
+            using std::end;
+            return std::lexicographical_compare(begin(lhs), end(lhs), begin(rhs), end(rhs));
+        }
+
+        inline bool operator<(const web::json::object& lhs, const web::json::object& rhs)
+        {
+            using std::begin;
+            using std::end;
+            return std::lexicographical_compare(begin(lhs), end(lhs), begin(rhs), end(rhs));
+        }
     }
 }
 

From 8733cef5a38ae851bd862a1caa53999e8bdac2f2 Mon Sep 17 00:00:00 2001
From: "Jonathan Thorpe (Sony)" <Jonathan.Thorpe@sony.com>
Date: Wed, 31 Jul 2024 17:54:46 +0100
Subject: [PATCH 2/2] Fix Ubuntu-14.04 build

---
 .github/workflows/build-test.yml     |  2 +-
 .github/workflows/src/build-test.yml | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index fd83c511..e5a813a8 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -646,7 +646,7 @@ jobs:
         # ubuntu-14.04 ca-certificates are out of date
         git config --global http.sslVerify false
         # build and install openssl
-        curl -OsSk https://openssl.org/source/old/1.1.1/openssl-1.1.1v.tar.gz
+        curl -OsSkL https://openssl.org/source/old/1.1.1/openssl-1.1.1v.tar.gz
         tar xzf openssl-1.1.1v.tar.gz
         cd openssl-1.1.1v
         ./config --prefix=/usr/local/custom-openssl --libdir=lib --openssldir=/etc/ssl
diff --git a/.github/workflows/src/build-test.yml b/.github/workflows/src/build-test.yml
index bae4d361..76a22427 100644
--- a/.github/workflows/src/build-test.yml
+++ b/.github/workflows/src/build-test.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, macos-11, windows-2019]
+        os: [ubuntu-20.04, macos-12, windows-2019]
         install_mdns: [false, true]
         use_conan: [true]
         force_cpprest_asio: [false]
@@ -26,18 +26,18 @@ jobs:
         enable_authorization: [false, true]
         exclude:
           # install_mdns is only meaningful on Linux
-          - os: macos-11
+          - os: macos-12
             enable_authorization: false
           - os: windows-2019
             enable_authorization: false
           - os: ubuntu-20.04
             enable_authorization: false
-          - os: macos-11
+          - os: macos-12
             install_mdns: true
           - os: windows-2019
             install_mdns: true
           # for now, unicast DNS-SD tests are only implemented on Linux
-          - os: macos-11
+          - os: macos-12
             dns_sd_mode: unicast
           - os: windows-2019
             dns_sd_mode: unicast
@@ -160,7 +160,7 @@ jobs:
         # ubuntu-14.04 ca-certificates are out of date
         git config --global http.sslVerify false
         # build and install openssl
-        curl -OsSk https://openssl.org/source/old/1.1.1/openssl-1.1.1v.tar.gz
+        curl -OsSkL https://openssl.org/source/old/1.1.1/openssl-1.1.1v.tar.gz
         tar xzf openssl-1.1.1v.tar.gz
         cd openssl-1.1.1v
         ./config --prefix=/usr/local/custom-openssl --libdir=lib --openssldir=/etc/ssl
@@ -205,8 +205,8 @@ jobs:
 
     - name: make badges
       run: |
-        # combine badges from all builds, exclude macos-11
-        ${{ github.workspace }}/Sandbox/make_badges.sh ${{ github.workspace }} ${{ runner.workspace }}/artifacts macos-11_auth macos-11_noauth
+        # combine badges from all builds, exclude macos-12
+        ${{ github.workspace }}/Sandbox/make_badges.sh ${{ github.workspace }} ${{ runner.workspace }}/artifacts macos-12_auth macos-12_noauth
 
         # force push to github onto an orphan 'badges' branch
         cd ${{ github.workspace }}