From 987460363742b0ce58781ea30de0c0df21a7048e Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Sun, 20 Oct 2019 20:32:53 +0300 Subject: [PATCH 1/9] build/CI/packaging: add CentOS 8 x86_64. --- .travis.yml | 5 +++++ scripts/buildpack.sh | 1 + 2 files changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index a39ceea..ccf0fbe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,7 @@ env: - TARGET=coverage - OS=el DIST=6 - OS=el DIST=7 + - OS=el DIST=8 - OS=fedora DIST=29 - OS=fedora DIST=30 - OS=fedora DIST=rawhide @@ -56,6 +57,8 @@ matrix: compiler: clang - env: OS=el DIST=7 compiler: clang + - env: OS=el DIST=8 + compiler: clang - env: OS=fedora DIST=29 compiler: clang - env: OS=fedora DIST=30 @@ -98,6 +101,8 @@ matrix: os: osx - env: OS=el DIST=7 os: osx + - env: OS=el DIST=8 + os: osx - env: OS=fedora DIST=29 os: osx - env: OS=fedora DIST=30 diff --git a/scripts/buildpack.sh b/scripts/buildpack.sh index 00c4d2c..d2cc1a1 100755 --- a/scripts/buildpack.sh +++ b/scripts/buildpack.sh @@ -49,6 +49,7 @@ PACKPACK_REPO=${PACKPACK_REPO:-akopytov/packpack} distros_x86_64=( "el 6 x86_64" "el 7 x86_64" + "el 8 x86_64" "fedora 29 x86_64" "fedora 39 x86_64" "ubuntu xenial x86_64" From 8b028faf32ad4ff52f63523c6434ae276d088d9f Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Sun, 20 Oct 2019 20:37:44 +0300 Subject: [PATCH 2/9] build/CI/packaging: remove Ubuntu Cosmic (EOL). --- .travis.yml | 8 -------- scripts/buildpack.sh | 3 --- 2 files changed, 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index ccf0fbe..1e3202b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,6 @@ env: - OS=fedora DIST=rawhide - OS=ubuntu DIST=xenial - OS=ubuntu DIST=bionic - - OS=ubuntu DIST=cosmic - OS=ubuntu DIST=disco - OS=debian DIST=jessie - OS=debian DIST=stretch @@ -44,7 +43,6 @@ env: - OS=debian DIST=sid - OS=ubuntu DIST=xenial ARCH=i386 - OS=ubuntu DIST=bionic ARCH=i386 - - OS=ubuntu DIST=cosmic ARCH=i386 - OS=ubuntu DIST=disco ARCH=i386 - OS=debian DIST=jessie ARCH=i386 - OS=debian DIST=stretch ARCH=i386 @@ -69,8 +67,6 @@ matrix: compiler: clang - env: OS=ubuntu DIST=bionic compiler: clang - - env: OS=ubuntu DIST=cosmic - compiler: clang - env: OS=ubuntu DIST=disco compiler: clang - env: OS=debian DIST=jessie @@ -85,8 +81,6 @@ matrix: compiler: clang - env: OS=ubuntu DIST=bionic ARCH=i386 compiler: clang - - env: OS=ubuntu DIST=cosmic ARCH=i386 - compiler: clang - env: OS=ubuntu DIST=disco ARCH=i386 compiler: clang - env: OS=debian DIST=jessie ARCH=i386 @@ -113,8 +107,6 @@ matrix: os: osx - env: OS=ubuntu DIST=bionic os: osx - - env: OS=ubuntu DIST=cosmic - os: osx - env: OS=ubuntu DIST=disco os: osx - env: OS=debian DIST=jessie diff --git a/scripts/buildpack.sh b/scripts/buildpack.sh index d2cc1a1..04d4e0e 100755 --- a/scripts/buildpack.sh +++ b/scripts/buildpack.sh @@ -54,7 +54,6 @@ distros_x86_64=( "fedora 39 x86_64" "ubuntu xenial x86_64" "ubuntu bionic x86_64" - "ubuntu cosmic x86_64" "ubuntu disco x86_64" "debian jessie x86_64" "debian stretch x86_64" @@ -64,7 +63,6 @@ distros_x86_64=( distros_i386=( "ubuntu xenial i386" "ubuntu bionic i386" - "ubuntu cosmic i386" "ubuntu disco i386" "debian jessie i386" "debian stretch i386" @@ -76,7 +74,6 @@ distros_aarch64=( "fedora 29 aarch64" "fedora 30 aarch64" "ubuntu bionic aarch64" - "ubuntu cosmic aarch64" "ubuntu disco aarch64" "ubuntu xenial aarch64" "debian jessie aarch64" From 92c8660873b208c6fc91d1b4788d848484fc8a16 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Sun, 20 Oct 2019 20:39:55 +0300 Subject: [PATCH 3/9] build/CI/packaging: add Ubuntu Eoan. --- .travis.yml | 8 ++++++++ scripts/buildpack.sh | 3 +++ 2 files changed, 11 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1e3202b..d9db1e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,6 +37,7 @@ env: - OS=ubuntu DIST=xenial - OS=ubuntu DIST=bionic - OS=ubuntu DIST=disco + - OS=ubuntu DIST=eoan - OS=debian DIST=jessie - OS=debian DIST=stretch - OS=debian DIST=buster @@ -44,6 +45,7 @@ env: - OS=ubuntu DIST=xenial ARCH=i386 - OS=ubuntu DIST=bionic ARCH=i386 - OS=ubuntu DIST=disco ARCH=i386 + - OS=ubuntu DIST=eoan ARCH=i386 - OS=debian DIST=jessie ARCH=i386 - OS=debian DIST=stretch ARCH=i386 - OS=debian DIST=buster ARCH=i386 @@ -69,6 +71,8 @@ matrix: compiler: clang - env: OS=ubuntu DIST=disco compiler: clang + - env: OS=ubuntu DIST=eoan + compiler: clang - env: OS=debian DIST=jessie compiler: clang - env: OS=debian DIST=stretch @@ -83,6 +87,8 @@ matrix: compiler: clang - env: OS=ubuntu DIST=disco ARCH=i386 compiler: clang + - env: OS=ubuntu DIST=eoan ARCH=i386 + compiler: clang - env: OS=debian DIST=jessie ARCH=i386 compiler: clang - env: OS=debian DIST=stretch ARCH=i386 @@ -109,6 +115,8 @@ matrix: os: osx - env: OS=ubuntu DIST=disco os: osx + - env: OS=ubuntu DIST=eoan + os: osx - env: OS=debian DIST=jessie os: osx - env: OS=debian DIST=stretch diff --git a/scripts/buildpack.sh b/scripts/buildpack.sh index 04d4e0e..9aad6d5 100755 --- a/scripts/buildpack.sh +++ b/scripts/buildpack.sh @@ -55,6 +55,7 @@ distros_x86_64=( "ubuntu xenial x86_64" "ubuntu bionic x86_64" "ubuntu disco x86_64" + "ubuntu eoan x86_64" "debian jessie x86_64" "debian stretch x86_64" "debian buster x86_64" @@ -64,6 +65,7 @@ distros_i386=( "ubuntu xenial i386" "ubuntu bionic i386" "ubuntu disco i386" + "ubuntu eoan i386" "debian jessie i386" "debian stretch i386" "debian buster i386" @@ -75,6 +77,7 @@ distros_aarch64=( "fedora 30 aarch64" "ubuntu bionic aarch64" "ubuntu disco aarch64" + "ubuntu eoan aarch64" "ubuntu xenial aarch64" "debian jessie aarch64" "debian stretch aarch64" From ac430bd7cfdbdb88bfe4e80d87b5ee2782446f99 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Sun, 20 Oct 2019 22:33:46 +0300 Subject: [PATCH 4/9] build/CI/packaging: use python2, if python is not available. This is required to fix cram tests on RHEL 8. --- tests/test_run.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tests/test_run.sh b/tests/test_run.sh index a90f533..11de298 100755 --- a/tests/test_run.sh +++ b/tests/test_run.sh @@ -83,4 +83,15 @@ export LUA_PATH . $SBTEST_CONFIG -cram --shell=/bin/bash --verbose $tests +if $(which python >/dev/null 2>&1) +then + PYTHON=python +elif $(which python2 >/dev/null 2&1) +then + PYTHON=python2 +else + echo "Cannot find python interpreter in PATH" + exit 1 +fi + +$PYTHON cram --shell=/bin/bash --verbose $tests From 6f70aed8bf29b72581102d8feaf8928cfa2e725a Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Sun, 20 Oct 2019 22:39:19 +0300 Subject: [PATCH 5/9] build/CI/packaging: pass an absolute path to cram. --- tests/test_run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_run.sh b/tests/test_run.sh index 11de298..3a54d17 100755 --- a/tests/test_run.sh +++ b/tests/test_run.sh @@ -94,4 +94,4 @@ else exit 1 fi -$PYTHON cram --shell=/bin/bash --verbose $tests +$PYTHON $(which cram) --shell=/bin/bash --verbose $tests From 5e48a42e7794272831cc5d51356eab2618e6603a Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Mon, 21 Oct 2019 07:51:25 +0300 Subject: [PATCH 6/9] build/CI/packaging: use 'command' instead of 'which'. --- tests/test_run.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_run.sh b/tests/test_run.sh index 3a54d17..e56e5f6 100755 --- a/tests/test_run.sh +++ b/tests/test_run.sh @@ -83,10 +83,10 @@ export LUA_PATH . $SBTEST_CONFIG -if $(which python >/dev/null 2>&1) +if $(command -v python >/dev/null 2>&1) then PYTHON=python -elif $(which python2 >/dev/null 2&1) +elif $(command -v python2 >/dev/null 2&1) then PYTHON=python2 else @@ -94,4 +94,4 @@ else exit 1 fi -$PYTHON $(which cram) --shell=/bin/bash --verbose $tests +$PYTHON command cram --shell=/bin/bash --verbose $tests From bad7feaa2784b2929e22a5eac0332168e357630c Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Mon, 21 Oct 2019 08:15:52 +0300 Subject: [PATCH 7/9] build/CI/packaging: use command correctly. --- tests/test_run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_run.sh b/tests/test_run.sh index e56e5f6..f5cbc2d 100755 --- a/tests/test_run.sh +++ b/tests/test_run.sh @@ -94,4 +94,4 @@ else exit 1 fi -$PYTHON command cram --shell=/bin/bash --verbose $tests +$PYTHON $(command -v cram) --shell=/bin/bash --verbose $tests From 4cce5eba75c78fd0d9603d6aff1ff168b8dec666 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Mon, 21 Oct 2019 08:28:18 +0300 Subject: [PATCH 8/9] build/CI/packaging: fix a typo in test_run.sh. --- tests/test_run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_run.sh b/tests/test_run.sh index f5cbc2d..669ed75 100755 --- a/tests/test_run.sh +++ b/tests/test_run.sh @@ -86,7 +86,7 @@ export LUA_PATH if $(command -v python >/dev/null 2>&1) then PYTHON=python -elif $(command -v python2 >/dev/null 2&1) +elif $(command -v python2 >/dev/null 2>&1) then PYTHON=python2 else From ab7d5829d7db25448e89c302ad392537da15f6a2 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Mon, 21 Oct 2019 09:23:05 +0300 Subject: [PATCH 9/9] Release 1.0.18. --- ChangeLog | 14 ++++++++++++++ configure.ac | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1c9e517..3ad5b54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2019-10-21 Alexey Kopytov + + * version 1.0.18 + * build/CI/packaging: add Ubuntu Eoan. + * build/CI/packaging: remove Ubuntu Cosmic (EOL). + * build/CI/packaging: add CentOS 8. + * build/CI/packaging: add Ubuntu Disco. + * build/CI/packaging: remove Ubuntu Trusty (EOL). + * build/CI/packaging: remove Fedora 28 (EOL). + * build/CI/packaging: add Fedora 30. + * build/CI/packaging: cherry-pick fix for LuaJIT/LuaJIT#484 to + fix builds on macOS Mojave. + * build/CI/packaging: add Debian Buster + 2019-03-15 Alexey Kopytov * version 1.0.17 diff --git a/configure.ac b/configure.ac index ff8ffb2..aef259a 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.17],[https://github.com/akopytov/sysbench/issues], +AC_INIT([sysbench],[1.0.18],[https://github.com/akopytov/sysbench/issues], [sysbench], [https://github.com/akopytov/sysbench]) AC_CONFIG_AUX_DIR([config])