Skip to content

Commit 23e4c61

Browse files
BillyONealBillyONeal
authored
Add Ubuntu 18.04 testing. (#1340)
1 parent 1f97f54 commit 23e4c61

File tree

3 files changed

+91
-65
lines changed

3 files changed

+91
-65
lines changed

‎azure-devops/build-ubuntu-apt.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
parameters:
2+
name: 'Ubuntu_1604_Apt'
3+
image: 'Ubuntu 16.04'
4+
5+
jobs:
6+
- job: ${{ parameters.name }}
7+
pool:
8+
vmImage: ${{ parameters.image }}
9+
steps:
10+
- script: |
11+
sudo apt -y remove php*
12+
sudo apt install -y ppa-purge
13+
sudo ppa-purge -y ppa:ondrej/php
14+
unset BOOST_ROOT
15+
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
16+
mkdir build.debug
17+
cd build.debug
18+
/usr/local/bin/cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug ..
19+
cd ..
20+
mkdir build.release
21+
cd build.release
22+
/usr/local/bin/cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ..
23+
cd ..
24+
ninja -C build.debug
25+
ninja -C build.release
26+
cd build.debug/Release/Binaries
27+
./test_runner *test.so
28+
cd ../../../build.release/Release/Binaries
29+
./test_runner *test.so
30+
displayName: Run build

‎azure-devops/build-ubuntu-vcpkg.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
parameters:
2+
name: 'Ubuntu_1604_Vcpkg'
3+
image: 'Ubuntu 16.04'
4+
5+
jobs:
6+
- job: ${{ parameters.name }}
7+
pool:
8+
vmImage: ${{ parameters.image }}
9+
steps:
10+
- script: |
11+
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
12+
sudo apt -y update
13+
sudo apt install g++-9 ninja-build -y
14+
git submodule update --init vcpkg
15+
./vcpkg/bootstrap-vcpkg.sh
16+
./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
17+
displayName: Vcpkg install dependencies
18+
- script: |
19+
mkdir build.debug
20+
mkdir build.release
21+
displayName: Make Build Directories
22+
- task: CMake@1
23+
inputs:
24+
workingDirectory: 'build.debug'
25+
cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..'
26+
- task: CMake@1
27+
inputs:
28+
workingDirectory: 'build.release'
29+
cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..'
30+
- script: |
31+
cd build.debug
32+
ninja
33+
displayName: 'Run ninja debug'
34+
- script: |
35+
cd build.debug/Release/Binaries
36+
./test_runner *test.so
37+
displayName: 'Run Tests debug'
38+
- script: |
39+
cd build.release
40+
ninja
41+
displayName: 'Run ninja, release'
42+
- script: |
43+
cd build.release/Release/Binaries
44+
./test_runner *test.so
45+
displayName: 'Run tests, release'

‎azure-pipelines.yml‎

Lines changed: 16 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -52,71 +52,22 @@ jobs:
5252
solution: 'build.common/ALL_BUILD.vcxproj'
5353
maximumCpuCount: true
5454
platform: 'x64'
55-
- job: Ubuntu_1604_Apt
56-
pool:
57-
vmImage: 'Ubuntu 16.04'
58-
steps:
59-
- script: |
60-
sudo apt -y remove php*
61-
sudo apt install -y ppa-purge
62-
sudo ppa-purge -y ppa:ondrej/php
63-
unset BOOST_ROOT
64-
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
65-
mkdir build.debug
66-
cd build.debug
67-
/usr/local/bin/cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug ..
68-
cd ..
69-
mkdir build.release
70-
cd build.release
71-
/usr/local/bin/cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ..
72-
cd ..
73-
ninja -C build.debug
74-
ninja -C build.release
75-
cd build.debug/Release/Binaries
76-
./test_runner *test.so
77-
cd ../../../build.release/Release/Binaries
78-
./test_runner *test.so
79-
displayName: Run build
80-
- job: Ubuntu_1604_Vcpkg
81-
pool:
82-
vmImage: 'Ubuntu 16.04'
83-
steps:
84-
- script: |
85-
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
86-
sudo apt -y update
87-
sudo apt install g++-9 ninja-build -y
88-
git submodule update --init vcpkg
89-
./vcpkg/bootstrap-vcpkg.sh
90-
./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
91-
displayName: Vcpkg install dependencies
92-
- script: |
93-
mkdir build.debug
94-
mkdir build.release
95-
displayName: Make Build Directories
96-
- task: CMake@1
97-
inputs:
98-
workingDirectory: 'build.debug'
99-
cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..'
100-
- task: CMake@1
101-
inputs:
102-
workingDirectory: 'build.release'
103-
cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..'
104-
- script: |
105-
cd build.debug
106-
ninja
107-
displayName: 'Run ninja debug'
108-
- script: |
109-
cd build.debug/Release/Binaries
110-
./test_runner *test.so
111-
displayName: 'Run Tests debug'
112-
- script: |
113-
cd build.release
114-
ninja
115-
displayName: 'Run ninja, release'
116-
- script: |
117-
cd build.release/Release/Binaries
118-
./test_runner *test.so
119-
displayName: 'Run tests, release'
55+
- template: azure-devops/build-ubuntu-apt.yml
56+
parameters:
57+
name: 'Ubuntu_1604_Apt'
58+
image: 'Ubuntu 16.04'
59+
- template: azure-devops/build-ubuntu-apt.yml
60+
parameters:
61+
name: 'Ubuntu_1804_Apt'
62+
image: 'Ubuntu 18.04'
63+
- template: azure-devops/build-ubuntu-vcpkg.yml
64+
parameters:
65+
name: 'Ubuntu_1604_Vcpkg'
66+
image: 'Ubuntu 16.04'
67+
- template: azure-devops/build-ubuntu-vcpkg.yml
68+
parameters:
69+
name: 'Ubuntu_1804_Vcpkg'
70+
image: 'Ubuntu 18.04'
12071
- job: Android
12172
pool:
12273
vmImage: 'Ubuntu 16.04'

0 commit comments

Comments
 (0)