@@ -153,46 +153,34 @@ jobs:
153
153
vmImage : ' Ubuntu 16.04'
154
154
steps :
155
155
- script : |
156
- sudo apt-get install -y ppa-purge
156
+ sudo apt -y remove php*
157
+ sudo apt install -y ppa-purge
157
158
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
161
161
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 : |
173
162
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
177
171
cd build.debug/Release/Binaries
178
172
./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
186
174
./test_runner *test.so
187
- displayName: ' Run tests, release'
175
+ displayName: Run build
188
176
- job : Ubuntu_1604_Vcpkg
189
177
pool :
190
178
vmImage : ' Ubuntu 16.04'
191
179
steps :
192
180
- script : |
193
181
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
196
184
./vcpkg/bootstrap-vcpkg.sh
197
185
./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
198
186
displayName: Vcpkg install dependencies
@@ -236,7 +224,7 @@ jobs:
236
224
displayName: 'Build for Android'
237
225
- job : MacOS_Homebrew
238
226
pool :
239
- vmImage : ' macOS-10.13 '
227
+ vmImage : ' macOS-10.14 '
240
228
steps :
241
229
- script : brew install boost openssl ninja
242
230
displayName : Brew install dependencies
@@ -279,7 +267,7 @@ jobs:
279
267
displayName: 'Run ninja, release static'
280
268
- job : MacOS_Vcpkg
281
269
pool :
282
- vmImage : ' macOS-10.13 '
270
+ vmImage : ' macOS-10.14 '
283
271
steps :
284
272
- script : |
285
273
brew install gcc ninja
@@ -314,11 +302,12 @@ jobs:
314
302
cd build.release/Release/Binaries
315
303
./test_runner *test.dylib
316
304
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'
0 commit comments