diff --git a/.travis.yml b/.travis.yml index d9db1e7..e5b9109 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,7 @@ env: - OS=el DIST=8 - OS=fedora DIST=29 - OS=fedora DIST=30 + - OS=fedora DIST=31 - OS=fedora DIST=rawhide - OS=ubuntu DIST=xenial - OS=ubuntu DIST=bionic @@ -63,6 +64,8 @@ matrix: compiler: clang - env: OS=fedora DIST=30 compiler: clang + - env: OS=fedora DIST=31 + compiler: clang - env: OS=fedora DIST=rawhide compiler: clang - env: OS=ubuntu DIST=xenial @@ -107,6 +110,8 @@ matrix: os: osx - env: OS=fedora DIST=30 os: osx + - env: OS=fedora DIST=31 + os: osx - env: OS=fedora DIST=rawhide os: osx - env: OS=ubuntu DIST=xenial @@ -160,6 +165,7 @@ before_install: if [ "x$TARGET" = "xtest" ]; then case "${TRAVIS_OS_NAME:-linux}" in osx) + brew update brew install mysql # OS X requires servers to be started explicitly @@ -185,13 +191,15 @@ before_install: fi install: - - pip2 install --user urllib3[secure] cpp-coveralls - > case "${TRAVIS_OS_NAME:-linux}" in osx) # OS X requires this for user-local pip packages export PATH=~/Library/Python/2.7/bin:$PATH ;; + linux) + pip install --user cpp-coveralls + ;; esac before_script: diff --git a/ChangeLog b/ChangeLog index 3ad5b54..dbd99e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2019-12-08 Alexey Kopytov + + * version 1.0.19 + * build/CI/packaging: fix Ubuntu packaging for Bionic and later versions + * regression tests: compatibility fix for PostgreSQL 12 + * build/CI/packaging: fix macOs builds in Travis + * build/CI/packaging: add Fedora 31. + 2019-10-21 Alexey Kopytov * version 1.0.18 diff --git a/debian/changelog b/debian/changelog index 4e47e42..fd9ab0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sysbench (1.0.18-1) unstable; urgency=low + + * add libssl-dev to build dependencies + + -- Alexey Kopytov Sun, 08 Dec 2019 14:02:01 +0300 + sysbench (1.0.15-2) unstable; urgency=low * add libaio-dev to build dependencies diff --git a/debian/control b/debian/control index 8770d2c..5048d94 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: sysbench Section: misc Priority: extra Maintainer: Alexey Kopytov -Build-Depends: debhelper, autoconf, automake, libaio-dev, libtool, libmysqlclient-dev | default-libmysqlclient-dev, libpq-dev, pkg-config, python +Build-Depends: debhelper, autoconf, automake, libaio-dev, libtool, libmysqlclient-dev | default-libmysqlclient-dev, libpq-dev, pkg-config, python, libssl-dev Standards-Version: 3.9.5 Homepage: https://github.com/akopytov/sysbench diff --git a/scripts/buildpack.sh b/scripts/buildpack.sh index b3e84e5..2e300c0 100755 --- a/scripts/buildpack.sh +++ b/scripts/buildpack.sh @@ -51,7 +51,8 @@ distros_x86_64=( "el 7 x86_64" "el 8 x86_64" "fedora 29 x86_64" - "fedora 39 x86_64" + "fedora 30 x86_64" + "fedora 31 x86_64" "ubuntu xenial x86_64" "ubuntu bionic x86_64" "ubuntu disco x86_64" @@ -75,6 +76,7 @@ distros_aarch64=( "el 7 aarch64" "fedora 29 aarch64" "fedora 30 aarch64" + "fedora 31 aarch64" "ubuntu bionic aarch64" "ubuntu disco aarch64" "ubuntu eoan aarch64" diff --git a/tests/include/pgsql_common.sh b/tests/include/pgsql_common.sh index e046c6d..27d2d85 100644 --- a/tests/include/pgsql_common.sh +++ b/tests/include/pgsql_common.sh @@ -26,7 +26,8 @@ function db_show_table() { ELSE '' END || CASE - WHEN f.atthasdef = 't' THEN 'default ' || d.adsrc + WHEN f.atthasdef = 't' THEN 'default ' || + pg_catalog.pg_get_expr(d.adbin, d.adrelid, true) ELSE '' END AS "Modifiers", CASE