Skip to content

Commit

Permalink
Remove Ubuntu 18.04 build target, EOL. Enable higher C++ standards on…
Browse files Browse the repository at this point in the history
… Ubuntu 20.04 and 22.04 targets. Attempt adding MsQuic to the installed dependencies
  • Loading branch information
kaetemi committed Feb 22, 2023
1 parent b266605 commit 2a380b0
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 48 deletions.
67 changes: 19 additions & 48 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,50 +1,4 @@
jobs:
- job: ubuntu18
timeoutInMinutes: 120
pool:
vmImage: 'ubuntu-18.04'
steps:
- script: |
sudo apt update
sudo apt install -y software-properties-common
# sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt update
sudo apt install cmake build-essential ninja-build ccache -y
sudo apt install gcc-8 g++-8 -y
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 60
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 60
sudo apt install bison autoconf automake -y
sudo apt install libpng-dev -y
sudo apt install libjpeg-dev -y
sudo apt install libgif-dev libfreetype6-dev -y
sudo apt install freeglut3-dev -y
sudo apt install liblua5.2-dev libluabind-dev libcpptest-dev -y
sudo apt install libogg-dev libvorbis-dev libopenal-dev -y
sudo apt install libavcodec-dev libavformat-dev libavdevice-dev libswscale-dev libpostproc-dev -y
sudo apt install libmysqlclient-dev -y
sudo apt install libxml2-dev -y
sudo apt install libcurl4-openssl-dev libssl-dev -y
sudo apt install libsquish-dev -y
sudo apt install liblzma-dev -y
sudo apt install libgsf-1-dev -y
sudo apt install qtbase5-dev qttools5-dev qttools5-dev-tools
displayName: 'Dependencies'
- script: |
mkdir build
cmake --version
cd build
cmake -G "Ninja" -DCMAKE_SUPPRESS_REGENERATION=ON \
-DWITH_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL_SAMPLES=ON \
-DWITH_LUA51=OFF -DWITH_LUA52=ON \
-DWITH_RYZOM=ON -DWITH_RYZOM_SERVER=ON -DWITH_RYZOM_CLIENT=ON -DWITH_RYZOM_TOOLS=ON \
-DWITH_NEL_TOOLS=ON -DWITH_NELNS=ON -DWITH_NELNS_LOGIN_SYSTEM=ON -DWITH_NELNS_SERVER=ON \
-DWITH_QT5=ON -DWITH_LIBGSF=ON ..
cat CMakeCache.txt
displayName: 'CMake'
- script: |
cd build
ninja -j`nproc`
displayName: 'Make'
- job: ubuntu20
timeoutInMinutes: 120
pool:
Expand All @@ -53,6 +7,8 @@ jobs:
- script: |
sudo apt update
sudo apt install -y software-properties-common
wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb
sudo dpkg -i packages-microsoft-prod.deb
sudo apt update
sudo apt install cmake build-essential ninja-build ccache -y
sudo apt install bison autoconf automake -y
Expand All @@ -70,12 +26,16 @@ jobs:
sudo apt install liblzma-dev -y
sudo apt install libgsf-1-dev -y
sudo apt install qtbase5-dev qttools5-dev qttools5-dev-tools
sudo apt install libmsquic
wget https://github.com/microsoft/msquic/blob/main/src/inc/msquic.h
sudo mv msquic.h /usr/include/msquic.h
displayName: 'Dependencies'
- script: |
mkdir build
cmake --version
cd build
cmake -G "Ninja" -DCMAKE_SUPPRESS_REGENERATION=ON \
-DCMAKE_CXX_STANDARD=17 -DCMAKE_C_STANDARD=11 \
-DWITH_STATIC=ON -DWITH_NEL_TESTS=ON -DWITH_NEL_SAMPLES=ON \
-DWITH_LUA51=OFF -DWITH_LUA52=ON \
-DWITH_RYZOM=ON -DWITH_RYZOM_SERVER=ON -DWITH_RYZOM_CLIENT=ON -DWITH_RYZOM_TOOLS=ON \
Expand All @@ -99,6 +59,8 @@ jobs:
- script: |
sudo apt update
sudo apt install -y software-properties-common
wget -q https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb
sudo dpkg -i packages-microsoft-prod.deb
sudo apt update
sudo apt install cmake build-essential ninja-build ccache -y
sudo apt install bison autoconf automake -y
Expand All @@ -116,12 +78,16 @@ jobs:
sudo apt install liblzma-dev -y
sudo apt install libgsf-1-dev -y
sudo apt install qtbase5-dev qttools5-dev qttools5-dev-tools
sudo apt install libmsquic
wget https://github.com/microsoft/msquic/blob/main/src/inc/msquic.h
sudo mv msquic.h /usr/include/msquic.h
displayName: 'Dependencies'
- script: |
mkdir build
cmake --version
cd build
cmake -G "Ninja" -DCMAKE_SUPPRESS_REGENERATION=ON \
-DCMAKE_CXX_STANDARD=17 -DCMAKE_C_STANDARD=11 \
-DWITH_STATIC=ON -DWITH_NEL_TESTS=ON -DWITH_NEL_SAMPLES=ON \
-DWITH_LUA51=OFF -DWITH_LUA52=ON \
-DWITH_RYZOM=ON -DWITH_RYZOM_SERVER=ON -DWITH_RYZOM_CLIENT=ON -DWITH_RYZOM_TOOLS=ON \
Expand All @@ -141,8 +107,8 @@ jobs:
strategy:
matrix:
ubuntu:
vmImage: 'ubuntu-18.04'
releaseName: 'Ubuntu18'
vmImage: 'ubuntu-20.04'
releaseName: 'Ubuntu20'
aptPackages: >-
libasound2-dev
libgl1-mesa-dev
Expand All @@ -151,6 +117,7 @@ jobs:
libxrandr-dev
libxrender-dev
libxxf86vm-dev
libmsquic
cmakeExtra: >-
-DCMAKE_INSTALL_LIBDIR=lib
win2019:
Expand All @@ -174,9 +141,13 @@ jobs:
- checkout: self
fetchDepth: 0
- script: |
wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb
sudo dpkg -i packages-microsoft-prod.deb
sudo apt update
sudo apt remove -y man-db
sudo apt install -y --no-install-recommends $(aptPackages)
wget https://github.com/microsoft/msquic/blob/main/src/inc/msquic.h
sudo mv msquic.h /usr/include/msquic.h
displayName: '(ubuntu) Dependencies'
condition: eq(variables['Agent.JobName'], 'client ubuntu')
- task: Cache@2
Expand Down

0 comments on commit 2a380b0

Please sign in to comment.