From 2b7b72807782644c8c88fe0b46aadb07fcffbbdc Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Mon, 27 Feb 2023 20:51:23 +0600 Subject: [PATCH] CI: bump Ubuntu to newer version, install missing DCO dependencies --- .appveyor.yml | 4 ++-- .ci/azure-pipelines/linux.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 761e3e4d..9c2bc8cb 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,6 +1,6 @@ version: '{build}' -image: Ubuntu1804 +image: Ubuntu2004 configuration: Release @@ -28,7 +28,7 @@ build_script: - .ci/memory-leak-test.sh test_script: - .ci/appveyor-deb-install-test.sh - - sudo apt-get update && sudo apt-get -y install autoconf libtool liblzo2-dev libpam-dev fping unzip liblz4-dev # openvpn build deps + - sudo apt-get update && sudo apt-get -y install autoconf libtool liblzo2-dev libpam-dev fping unzip liblz4-dev libnl-genl-3-dev # openvpn build deps - sudo .ci/start-se-openvpn.sh - sudo .ci/run-openvpn-tests.sh diff --git a/.ci/azure-pipelines/linux.yml b/.ci/azure-pipelines/linux.yml index 56574f2d..fbb8aeb5 100644 --- a/.ci/azure-pipelines/linux.yml +++ b/.ci/azure-pipelines/linux.yml @@ -1,12 +1,12 @@ jobs: - job: Ubuntu_x64 pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-22.04 steps: - checkout: self submodules: true persistCredentials: true - - script: sudo apt update && sudo apt-get -y install cmake gcc g++ ninja-build libncurses5-dev libreadline-dev libsodium-dev libssl-dev make zlib1g-dev liblz4-dev + - script: sudo apt update && sudo apt-get -y install cmake gcc g++ ninja-build libncurses5-dev libreadline-dev libsodium-dev libssl-dev make zlib1g-dev liblz4-dev libnl-genl-3-dev displayName: 'Prepare environment' - script: "$(Build.SourcesDirectory)/.ci/azure-pipelines/linux_build.sh" env: