From 07c5716374fde9fc26b65fc6408cbb812da5c5f7 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Sat, 15 Dec 2018 22:32:19 +0500 Subject: [PATCH 1/3] configure: allow to specify CPACK_GENERATOR explicitly --- configure | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 9e16fb09..50af363c 100755 --- a/configure +++ b/configure @@ -35,7 +35,10 @@ if [ -z ${OPENSSL_ROOT_DIR} ]; then fi fi -if [ -x "$(command -v rpm)" ]; then +if [ ! -z ${CPACK_GENERATOR+x} ]; then + echo "CPACK_GENERATOR is set, CPack will generate ${CPACK_GENERATOR} packages." + CMAKE_FLAGS="-DCPACK_GENERATOR=${CPACK_GENERATOR} ${CMAKE_FLAGS}" +elif [ -x "$(command -v rpm)" ]; then echo "'rpm' executable found, CPack will generate RPM packages." CMAKE_FLAGS="-DCPACK_GENERATOR='RPM' ${CMAKE_FLAGS}" else From 6d32be3eb35a005445c50c164235954e29c459fc Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Sat, 15 Dec 2018 22:34:43 +0500 Subject: [PATCH 2/3] initial setup of Azure Pipelines --- azure-pipelines.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 azure-pipelines.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 00000000..9d91f304 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,16 @@ +pool: + vmImage: 'Ubuntu 16.04' + +variables: + CPACK_GENERATOR: DEB + +steps: +- checkout: self + submodules: recursive + +- script: | + sudo apt -y install cmake gcc g++ libncurses5-dev libreadline-dev libssl-dev make zlib1g-dev + ./configure + make package -C tmp -j $(nproc || sysctl -n hw.ncpu || echo 4) + .ci/appveyor-deb-install-test.sh + displayName: 'Ubuntu 16.04' From 3ff10dc8edf00ef09194c3cb92e68740f030fdcd Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Sat, 15 Dec 2018 22:35:40 +0500 Subject: [PATCH 3/3] CI: avoid not needed builds when possible --- .appveyor.yml | 1 + .gitlab-ci.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index c2fba8c4..4f018054 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -15,6 +15,7 @@ skip_commits: files: - .travis.yml - .gitlab-ci.yml + - azure-pipelines.yml init: - ps: Update-AppveyorBuild -Version "build-$env:APPVEYOR_BUILD_NUMBER-$($env:APPVEYOR_REPO_COMMIT.substring(0,7))" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f0a5cdb..c31f0a10 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,7 @@ changes: - .appveyor.yml - .travis.yml + - azure-pipelines.yml before_script: - REPOSITORY="$PWD" && cd .. - apt-get update && apt-get install -y dpkg-dev wget g++ gcc libncurses5-dev libreadline-dev libssl-dev make zlib1g-dev git file