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 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' 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