From 247a531a532a3f1b73af681187d8728f78478568 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Wed, 30 Oct 2019 08:26:09 +0300 Subject: [PATCH 01/13] build/CI/packaging: fix a typo in buildpack.sh. --- scripts/buildpack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/buildpack.sh b/scripts/buildpack.sh index 9aad6d5..a3aa2fd 100755 --- a/scripts/buildpack.sh +++ b/scripts/buildpack.sh @@ -51,7 +51,7 @@ distros_x86_64=( "el 7 x86_64" "el 8 x86_64" "fedora 29 x86_64" - "fedora 39 x86_64" + "fedora 30 x86_64" "ubuntu xenial x86_64" "ubuntu bionic x86_64" "ubuntu disco x86_64" From b6295034aaf31e8593b88b468dc9b074215e5dc7 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Wed, 30 Oct 2019 09:47:02 +0300 Subject: [PATCH 02/13] build/CI/packaging: add Fedora 31. --- .travis.yml | 5 +++++ scripts/buildpack.sh | 2 ++ 2 files changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index d9db1e7..2bc53a4 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 diff --git a/scripts/buildpack.sh b/scripts/buildpack.sh index a3aa2fd..1e344b7 100755 --- a/scripts/buildpack.sh +++ b/scripts/buildpack.sh @@ -52,6 +52,7 @@ distros_x86_64=( "el 8 x86_64" "fedora 29 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" From 40f1eda82da75d5fc1f3b48f31e29e29b811c87e Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Mon, 2 Dec 2019 21:21:12 +0300 Subject: [PATCH 03/13] build/CI/packaging: fix macOs builds in Travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2bc53a4..75ff8c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -165,7 +165,7 @@ before_install: if [ "x$TARGET" = "xtest" ]; then case "${TRAVIS_OS_NAME:-linux}" in osx) - brew install mysql + brew install openssl mysql # OS X requires servers to be started explicitly brew services start mysql From 7a4066256e877217e1e0321a11be2cb1bdd8fb7a Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Mon, 2 Dec 2019 22:08:59 +0300 Subject: [PATCH 04/13] build/CI/packaging: another attempt to fix macOS builds in Travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 75ff8c5..3b4801c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -190,7 +190,7 @@ before_install: fi install: - - pip2 install --user urllib3[secure] cpp-coveralls + - pip2 install --user cpp-coveralls - > case "${TRAVIS_OS_NAME:-linux}" in osx) From 9bb5afec831313c09a5f26752fadb9e66d825b04 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Mon, 2 Dec 2019 22:39:37 +0300 Subject: [PATCH 05/13] build/CI/packaging: another attempt to fix macOS builds in Travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3b4801c..dde02ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -165,7 +165,7 @@ before_install: if [ "x$TARGET" = "xtest" ]; then case "${TRAVIS_OS_NAME:-linux}" in osx) - brew install openssl mysql + brew install mysql # OS X requires servers to be started explicitly brew services start mysql @@ -190,7 +190,7 @@ before_install: fi install: - - pip2 install --user cpp-coveralls + - pip install --user cpp-coveralls - > case "${TRAVIS_OS_NAME:-linux}" in osx) From c3dd04fec1b8a4bf845c0f3ce6682f4799053749 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Tue, 3 Dec 2019 08:21:28 +0300 Subject: [PATCH 06/13] build/CI/packaging: another attempt to fix macOS builds in Travis --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index dde02ce..2e9e902 100644 --- a/.travis.yml +++ b/.travis.yml @@ -165,6 +165,11 @@ before_install: if [ "x$TARGET" = "xtest" ]; then case "${TRAVIS_OS_NAME:-linux}" in osx) + brew install openssl + brew link openssl --force + brew uninstall python + brew install python --with-brewed-openssl + brew install mysql # OS X requires servers to be started explicitly From 9dc6a8908d0c54ba30668d399ace29f1f7bcf63b Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Tue, 3 Dec 2019 20:10:13 +0300 Subject: [PATCH 07/13] build/CI/packaging: another attempt to fix macOS builds in Travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2e9e902..1621e4b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -167,7 +167,7 @@ before_install: osx) brew install openssl brew link openssl --force - brew uninstall python + brew uninstall --ignore-dependencies python brew install python --with-brewed-openssl brew install mysql From d70fde5610e0ad8793b22ccedc4fc34319530799 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Tue, 3 Dec 2019 21:10:36 +0300 Subject: [PATCH 08/13] build/CI/packaging: another attempt to fix macOS builds in Travis --- .travis.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1621e4b..8f95e43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -165,11 +165,6 @@ before_install: if [ "x$TARGET" = "xtest" ]; then case "${TRAVIS_OS_NAME:-linux}" in osx) - brew install openssl - brew link openssl --force - brew uninstall --ignore-dependencies python - brew install python --with-brewed-openssl - brew install mysql # OS X requires servers to be started explicitly @@ -195,13 +190,15 @@ before_install: fi install: - - pip install --user 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: From 2776a24ce8141e27d3b502c9af8cab0efb263177 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Sun, 8 Dec 2019 13:41:24 +0300 Subject: [PATCH 09/13] build/CI/packaging: another attempt to fix macOS builds in Travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 8f95e43..e5b9109 100644 --- a/.travis.yml +++ b/.travis.yml @@ -165,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 From cf310c37c21738f8d8f091e68258d4d1ae6d7d47 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Sun, 8 Dec 2019 14:23:21 +0300 Subject: [PATCH 10/13] regression tests: compatibility fix for PostgreSQL 12 --- tests/include/pgsql_common.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 From 69980c0610823c398bf867b019c1b792a409a8ab Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Sun, 8 Dec 2019 14:24:09 +0300 Subject: [PATCH 11/13] build/CI/packaging: fix Ubuntu packaging for Bionic and later versions --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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 From 8a4d96dd9b901a67bddeca1163c327f453a9a63e Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Sun, 8 Dec 2019 15:04:05 +0300 Subject: [PATCH 12/13] Release 1.0.19 --- ChangeLog | 8 ++++++++ configure.ac | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3ad5b54..6e626b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2019-12-08 Alexey Kopytov + + * version 1.0.18 + * 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/configure.ac b/configure.ac index aef259a..04e2646 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.63) -AC_INIT([sysbench],[1.0.18],[https://github.com/akopytov/sysbench/issues], +AC_INIT([sysbench],[1.0.19],[https://github.com/akopytov/sysbench/issues], [sysbench], [https://github.com/akopytov/sysbench]) AC_CONFIG_AUX_DIR([config]) From 89428b12985da14d01005681d4cd42cb204dd63b Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Sun, 8 Dec 2019 15:08:41 +0300 Subject: [PATCH 13/13] build/CI/packaging: fix version number in Changelog --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6e626b8..dbd99e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ 2019-12-08 Alexey Kopytov - * version 1.0.18 + * 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