diff --git a/.ci/check-debian-package-version.sh b/.ci/check-debian-package-version.sh deleted file mode 100755 index 1b38380e..00000000 --- a/.ci/check-debian-package-version.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -set -e - -while IFS=$'\n\r' read -r line || [[ -n "$line" ]]; do - echo "Text read from file: $line" - case $line in - BUILD_NUMBER\ *) - BUILD_NUMBER=${line#BUILD_NUMBER } - ;; - VERSION\ *) - VERSION=${line#VERSION } - ;; - BUILD_NAME\ *) - BUILD_NAME=${line#BUILD_NAME } - ;; - - esac -done < "src/CurrentBuild.txt" - -VERSION=${VERSION:0:1}.${VERSION:1} # Add a colon after the first character. ("501" => "5.01") - -CHANGELOG_VERSION="(0:$VERSION.$BUILD_NUMBER) $BUILD_NAME" - -IFS=$'\n\r' read -r line < "debian/changelog" -if [[ $line == *$CNANGELOG_VERSION* ]]; then - echo "debian/changelog matches src/CurrentBuild.txt" -else - echo "debian/changelog does not match src/CurrentBuild.txt" - exit 1 -fi diff --git a/.travis.yml b/.travis.yml index e7220b7c..4d712467 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,12 +20,6 @@ matrix: - env: OPENSSL_VERSION="1.1.0f" os: linux compiler: clang - - env: DESCRIPTION="check debian package version" - os: linux - before_install: - - true - script: - - .ci/check-debian-package-version.sh - os: osx compiler: clang cache: @@ -58,4 +52,4 @@ script: - ./configure - make -C tmp - ldd bin/vpnserver/vpnserver - - if [ "${BUILD_DEB}" = "1" ]; then debuild -i -us -uc -b; fi + - if [ "${BUILD_DEB}" = "1" ]; then make package -C tmp; fi