Skip to content

Commit 0e9fef8

Browse files
authored
Fix broken CI Builds (microsoft#1156)
* Update vcpkg. * Attempt to fix Ubuntu apt and update MacOS. * Workaround Azure Pipelines forcing an updated copy of boost that doesn't work with default Ubuntu libs. * Add test runs back. * Update boost-for-android and block Boost 1.69 on the image. * Update boost and openssl on iOS. * Use right path to test binaries. * Shut off iOS builds.
1 parent ce50b8c commit 0e9fef8

File tree

4 files changed

+34
-43
lines changed

4 files changed

+34
-43
lines changed

Build_android/configure.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ done
9292

9393
# Variables setup
9494

95+
unset BOOST_ROOT
96+
9597
if [ ! -e "${ANDROID_NDK}/ndk-build" ]
9698
then
9799
echo "ANDROID_NDK does not point to a valid NDK."
@@ -153,7 +155,7 @@ if [ "${DO_OPENSSL}" == "1" ]; then (
153155
if [ "${DO_BOOST}" == "1" ]; then (
154156
if [ ! -d 'Boost-for-Android' ]; then git clone https://github.com/moritz-wundke/Boost-for-Android; fi
155157
cd Boost-for-Android
156-
git checkout 1356b87fed389b4abf1ff671adec0b899877174b
158+
git checkout b1e2cb397d3ec573f1cfdf4f4d965766204c53f1
157159
PATH="$PATH:$NDK_DIR" \
158160
CXXFLAGS="-std=gnu++11" \
159161
./build-android.sh \

Build_iOS/configure.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ while (( "$#" )); do
7373
done
7474

7575
## Configuration
76-
DEFAULT_BOOST_VERSION=1.67.0
77-
DEFAULT_OPENSSL_VERSION=1.0.2o
76+
DEFAULT_BOOST_VERSION=1.69.0
77+
DEFAULT_OPENSSL_VERSION=1.1.0k
7878
BOOST_VERSION=${BOOST_VERSION:-${DEFAULT_BOOST_VERSION}}
7979
OPENSSL_VERSION=${OPENSSL_VERSION:-${DEFAULT_OPENSSL_VERSION}}
8080
CPPRESTSDK_BUILD_TYPE=${CPPRESTSDK_BUILD_TYPE:-Release}
@@ -96,7 +96,7 @@ if [ ! -e $ABS_PATH/boost.framework ] && [ ! -d $ABS_PATH/boost ]; then
9696
git clone https://github.com/faithfracture/Apple-Boost-BuildScript ${ABS_PATH}/Apple-Boost-BuildScript
9797
fi
9898
pushd ${ABS_PATH}/Apple-Boost-BuildScript
99-
git checkout 1b94ec2e2b5af1ee036d9559b96e70c113846392
99+
git checkout 1ebe6e7654d9c9e1792076ee3827a45d5d2f34c5
100100
BOOST_LIBS="thread chrono filesystem regex system random" ./boost.sh -ios -tvos --boost-version $BOOST_VERSION
101101
popd
102102
mv ${ABS_PATH}/Apple-Boost-BuildScript/build/boost/${BOOST_VERSION}/ios/framework/boost.framework ${ABS_PATH}

azure-pipelines.yml

Lines changed: 27 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -153,46 +153,34 @@ jobs:
153153
vmImage: 'Ubuntu 16.04'
154154
steps:
155155
- script: |
156-
sudo apt-get install -y ppa-purge
156+
sudo apt -y remove php*
157+
sudo apt install -y ppa-purge
157158
sudo ppa-purge -y ppa:ondrej/php
158-
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
159-
displayName: Apt install dependencies
160-
- script: |
159+
unset BOOST_ROOT
160+
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
161161
mkdir build.debug
162-
mkdir build.release
163-
displayName: Make Build Directories
164-
- task: CMake@1
165-
inputs:
166-
workingDirectory: 'build.debug'
167-
cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Debug ..'
168-
- task: CMake@1
169-
inputs:
170-
workingDirectory: 'build.release'
171-
cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release ..'
172-
- script: |
173162
cd build.debug
174-
ninja
175-
displayName: 'Run ninja, debug'
176-
- script: |
163+
/usr/local/bin/cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug ..
164+
cd ..
165+
mkdir build.release
166+
cd build.release
167+
/usr/local/bin/cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ..
168+
cd ..
169+
ninja -C build.debug
170+
ninja -C build.release
177171
cd build.debug/Release/Binaries
178172
./test_runner *test.so
179-
displayName: 'Run tests, debug'
180-
- script: |
181-
cd build.release
182-
ninja
183-
displayName: 'Run ninja, release'
184-
- script: |
185-
cd build.release/Release/Binaries
173+
cd ../../../build.release/Release/Binaries
186174
./test_runner *test.so
187-
displayName: 'Run tests, release'
175+
displayName: Run build
188176
- job: Ubuntu_1604_Vcpkg
189177
pool:
190178
vmImage: 'Ubuntu 16.04'
191179
steps:
192180
- script: |
193181
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
194-
sudo apt-get -y update
195-
sudo apt-get install g++-7 ninja-build -y
182+
sudo apt -y update
183+
sudo apt install g++-9 ninja-build -y
196184
./vcpkg/bootstrap-vcpkg.sh
197185
./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
198186
displayName: Vcpkg install dependencies
@@ -236,7 +224,7 @@ jobs:
236224
displayName: 'Build for Android'
237225
- job: MacOS_Homebrew
238226
pool:
239-
vmImage: 'macOS-10.13'
227+
vmImage: 'macOS-10.14'
240228
steps:
241229
- script: brew install boost openssl ninja
242230
displayName: Brew install dependencies
@@ -279,7 +267,7 @@ jobs:
279267
displayName: 'Run ninja, release static'
280268
- job: MacOS_Vcpkg
281269
pool:
282-
vmImage: 'macOS-10.13'
270+
vmImage: 'macOS-10.14'
283271
steps:
284272
- script: |
285273
brew install gcc ninja
@@ -314,11 +302,12 @@ jobs:
314302
cd build.release/Release/Binaries
315303
./test_runner *test.dylib
316304
displayName: 'Run tests, release'
317-
- job: MacOS_iOS
318-
pool:
319-
vmImage: 'macOS-10.13'
320-
steps:
321-
- script: |
322-
cd Build_iOS
323-
./configure.sh
324-
displayName: 'Build for iOS'
305+
# iOS is disabled for now because the dependency Apple-Boost-BuildScript appears to be broken with the version of XCode in use in Pipelines.
306+
# - job: MacOS_iOS
307+
# pool:
308+
# vmImage: 'macOS-10.14'
309+
# steps:
310+
# - script: |
311+
# cd Build_iOS
312+
# ./configure.sh
313+
# displayName: 'Build for iOS'

vcpkg

Submodule vcpkg updated 2304 files

0 commit comments

Comments
 (0)