From defa466a6aa1032b07040bf82c7ef663120cf8ea Mon Sep 17 00:00:00 2001 From: "Billy O'Neal (VC LIBS)" Date: Wed, 12 Jun 2019 15:15:35 -0700 Subject: [PATCH 1/8] Update vcpkg. --- vcpkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg b/vcpkg index c7d4696a88..b7d6160b80 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit c7d4696a8857235ec8e3497e43f0d6fe3d4b5396 +Subproject commit b7d6160b80f417137bc480137b946c91f3272bf5 From af7ea861f004b49d098003643275e34b5e2520e2 Mon Sep 17 00:00:00 2001 From: "Billy O'Neal (VC LIBS)" Date: Wed, 12 Jun 2019 15:37:00 -0700 Subject: [PATCH 2/8] Attempt to fix Ubuntu apt and update MacOS. --- azure-pipelines.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 23cd6f03ff..bdf58e6d78 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -153,9 +153,10 @@ 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 + 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 displayName: Apt install dependencies - script: | mkdir build.debug @@ -191,8 +192,8 @@ jobs: 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 +237,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 +280,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 @@ -316,7 +317,7 @@ jobs: displayName: 'Run tests, release' - job: MacOS_iOS pool: - vmImage: 'macOS-10.13' + vmImage: 'macOS-10.14' steps: - script: | cd Build_iOS From 23815a5969c7af105480dc0e3155c20da8cb2835 Mon Sep 17 00:00:00 2001 From: "Billy O'Neal (VC LIBS)" Date: Wed, 12 Jun 2019 15:59:37 -0700 Subject: [PATCH 3/8] Workaround Azure Pipelines forcing an updated copy of boost that doesn't work with default Ubuntu libs. --- azure-pipelines.yml | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bdf58e6d78..ec43676294 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -156,36 +156,18 @@ jobs: sudo apt -y remove php* sudo apt install -y ppa-purge sudo ppa-purge -y ppa:ondrej/php + 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 - displayName: Apt install dependencies - - script: | 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 + /usr/local/bin/cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug .. ninja - displayName: 'Run ninja, debug' - - script: | - cd build.debug/Release/Binaries - ./test_runner *test.so - displayName: 'Run tests, debug' - - script: | + cd .. + mkdir build.release cd build.release + /usr/local/bin/cmake -G Ninja -DCMAKE_BUILD_TYPE=Release .. ninja - displayName: 'Run ninja, release' - - script: | - 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' From 3aad76739d82f829fdb753ecc2bcd1a247d44b82 Mon Sep 17 00:00:00 2001 From: "Billy O'Neal (VC LIBS)" Date: Wed, 12 Jun 2019 16:08:40 -0700 Subject: [PATCH 4/8] Add test runs back. --- azure-pipelines.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ec43676294..d9b364dda0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -161,12 +161,18 @@ jobs: mkdir build.debug cd build.debug /usr/local/bin/cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug .. - ninja cd .. mkdir build.release cd build.release /usr/local/bin/cmake -G Ninja -DCMAKE_BUILD_TYPE=Release .. - ninja + cd .. + ninja -C build.debug + ninja -C build.release + cd build.debug + ./test_runner *test.so + cd .. + cd build.release + ./test_runner *test.so displayName: Run build - job: Ubuntu_1604_Vcpkg pool: From b557dd219a30f8e344289f52949151b814dcbcab Mon Sep 17 00:00:00 2001 From: "Billy O'Neal (VC LIBS)" Date: Wed, 12 Jun 2019 16:12:35 -0700 Subject: [PATCH 5/8] Update boost-for-android and block Boost 1.69 on the image. --- Build_android/configure.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Build_android/configure.sh b/Build_android/configure.sh index 0d218a46b4..b4e3e1748d 100755 --- a/Build_android/configure.sh +++ b/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 \ From d5f350655e93750e5e4e5c76bbf6c8acea057340 Mon Sep 17 00:00:00 2001 From: "Billy O'Neal (VC LIBS)" Date: Wed, 12 Jun 2019 16:32:11 -0700 Subject: [PATCH 6/8] Update boost and openssl on iOS. --- Build_iOS/configure.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Build_iOS/configure.sh b/Build_iOS/configure.sh index d4240d8943..722128e3d9 100755 --- a/Build_iOS/configure.sh +++ b/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} From ac67f70d0a44876a1340160978a41f7ffedb133a Mon Sep 17 00:00:00 2001 From: "Billy O'Neal (VC LIBS)" Date: Wed, 12 Jun 2019 16:33:54 -0700 Subject: [PATCH 7/8] Use right path to test binaries. --- azure-pipelines.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d9b364dda0..2c7a7714d4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -168,10 +168,9 @@ jobs: cd .. ninja -C build.debug ninja -C build.release - cd build.debug + cd build.debug/Release/Binaries ./test_runner *test.so - cd .. - cd build.release + cd ../../../build.release/Release/Binaries ./test_runner *test.so displayName: Run build - job: Ubuntu_1604_Vcpkg From 5b6f093490d6685993f3a5ea0e10e51430371cdb Mon Sep 17 00:00:00 2001 From: "Billy O'Neal (VC LIBS)" Date: Wed, 12 Jun 2019 18:38:10 -0700 Subject: [PATCH 8/8] Shut off iOS builds. --- azure-pipelines.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2c7a7714d4..48d30a1ab8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -302,11 +302,12 @@ jobs: cd build.release/Release/Binaries ./test_runner *test.dylib displayName: 'Run tests, release' - - job: MacOS_iOS - pool: - vmImage: 'macOS-10.14' - 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'