Fix broken CI Builds

Build_android/configure.sh

@@ -92,6 +92,8 @@ done
 
 # Variables setup
 
+unset BOOST_ROOT
+
 if [ ! -e "${ANDROID_NDK}/ndk-build" ]
 then
     echo "ANDROID_NDK does not point to a valid NDK."
@@ -153,7 +155,7 @@ if [ "${DO_OPENSSL}" == "1" ]; then (
 if [ "${DO_BOOST}" == "1" ]; then (
     if [ ! -d 'Boost-for-Android' ]; then git clone https://github.com/moritz-wundke/Boost-for-Android; fi
     cd Boost-for-Android
-    git checkout 1356b87fed389b4abf1ff671adec0b899877174b
+    git checkout b1e2cb397d3ec573f1cfdf4f4d965766204c53f1
     PATH="$PATH:$NDK_DIR" \
     CXXFLAGS="-std=gnu++11" \
     ./build-android.sh \

Build_iOS/configure.sh

@@ -73,8 +73,8 @@ while (( "$#" )); do
 done
 
 ## Configuration
-DEFAULT_BOOST_VERSION=1.67.0
-DEFAULT_OPENSSL_VERSION=1.0.2o
+DEFAULT_BOOST_VERSION=1.69.0
+DEFAULT_OPENSSL_VERSION=1.1.0k
 BOOST_VERSION=${BOOST_VERSION:-${DEFAULT_BOOST_VERSION}}
 OPENSSL_VERSION=${OPENSSL_VERSION:-${DEFAULT_OPENSSL_VERSION}}
 CPPRESTSDK_BUILD_TYPE=${CPPRESTSDK_BUILD_TYPE:-Release}
@@ -96,7 +96,7 @@ if [ ! -e $ABS_PATH/boost.framework ] && [ ! -d $ABS_PATH/boost ]; then
         git clone https://github.com/faithfracture/Apple-Boost-BuildScript ${ABS_PATH}/Apple-Boost-BuildScript
     fi
     pushd ${ABS_PATH}/Apple-Boost-BuildScript
-    git checkout 1b94ec2e2b5af1ee036d9559b96e70c113846392
+    git checkout 1ebe6e7654d9c9e1792076ee3827a45d5d2f34c5
     BOOST_LIBS="thread chrono filesystem regex system random" ./boost.sh -ios -tvos --boost-version $BOOST_VERSION
     popd
     mv ${ABS_PATH}/Apple-Boost-BuildScript/build/boost/${BOOST_VERSION}/ios/framework/boost.framework ${ABS_PATH}

azure-pipelines.yml

@@ -153,46 +153,34 @@ jobs:
       vmImage: 'Ubuntu 16.04'
     steps:
     - script: |
-        sudo apt-get install -y ppa-purge
+        sudo apt -y remove php*
+        sudo apt install -y ppa-purge
         sudo ppa-purge -y ppa:ondrej/php
-        sudo apt-get install -y libboost-atomic-dev libboost-thread-dev libboost-system-dev libboost-date-time-dev libboost-regex-dev libboost-filesystem-dev libboost-random-dev libboost-chrono-dev libboost-serialization-dev libwebsocketpp-dev openssl libssl-dev ninja-build
-      displayName: Apt install dependencies
-    - script: |
+        unset BOOST_ROOT
+        sudo apt install -y libboost-atomic-dev libboost-thread-dev libboost-system-dev libboost-date-time-dev libboost-regex-dev libboost-filesystem-dev libboost-random-dev libboost-chrono-dev libboost-serialization-dev libwebsocketpp-dev openssl libssl-dev ninja-build
         mkdir build.debug
-        mkdir build.release
-      displayName: Make Build Directories
-    - task: CMake@1
-      inputs:
-        workingDirectory: 'build.debug'
-        cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Debug ..'
-    - task: CMake@1
-      inputs:
-        workingDirectory: 'build.release'
-        cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release ..'
-    - script: |
         cd build.debug
-        ninja
-      displayName: 'Run ninja, debug'
-    - script: |
+        /usr/local/bin/cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug ..
+        cd ..
+        mkdir build.release
+        cd build.release
+        /usr/local/bin/cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ..
+        cd ..
+        ninja -C build.debug
+        ninja -C build.release
         cd build.debug/Release/Binaries
         ./test_runner *test.so
-      displayName: 'Run tests, debug'
-    - script: |
-        cd build.release
-        ninja
-      displayName: 'Run ninja, release'
-    - script: |
-        cd build.release/Release/Binaries
+        cd ../../../build.release/Release/Binaries
         ./test_runner *test.so
-      displayName: 'Run tests, release'
+      displayName: Run build
   - job: Ubuntu_1604_Vcpkg
     pool:
       vmImage: 'Ubuntu 16.04'
     steps:
     - script: |
         sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-        sudo apt-get -y update
-        sudo apt-get install g++-7 ninja-build -y
+        sudo apt -y update
+        sudo apt install g++-9 ninja-build -y
         ./vcpkg/bootstrap-vcpkg.sh
         ./vcpkg/vcpkg install zlib openssl boost-system boost-date-time boost-regex websocketpp boost-thread boost-filesystem boost-random boost-chrono boost-interprocess brotli --vcpkg-root ./vcpkg
       displayName: Vcpkg install dependencies
@@ -236,7 +224,7 @@ jobs:
       displayName: 'Build for Android'
   - job: MacOS_Homebrew
     pool:
-      vmImage: 'macOS-10.13'
+      vmImage: 'macOS-10.14'
     steps:
     - script: brew install boost openssl ninja
       displayName: Brew install dependencies
@@ -279,7 +267,7 @@ jobs:
       displayName: 'Run ninja, release static'
   - job: MacOS_Vcpkg
     pool:
-      vmImage: 'macOS-10.13'
+      vmImage: 'macOS-10.14'
     steps:
     - script: |
         brew install gcc ninja
@@ -314,11 +302,12 @@ jobs:
         cd build.release/Release/Binaries
         ./test_runner *test.dylib
       displayName: 'Run tests, release'
-  - job: MacOS_iOS
-    pool:
-      vmImage: 'macOS-10.13'
-    steps:
-    - script: |
-        cd Build_iOS
-        ./configure.sh
-      displayName: 'Build for iOS'
+  # iOS is disabled for now because the dependency Apple-Boost-BuildScript appears to be broken with the version of XCode in use in Pipelines.
+  # - job: MacOS_iOS
+  #   pool:
+  #     vmImage: 'macOS-10.14'
+  #   steps:
+  #   - script: |
+  #       cd Build_iOS
+  #       ./configure.sh
+  #     displayName: 'Build for iOS'