diff --git a/.travis.yml b/.travis.yml index a39ceea..d9db1e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,21 +30,22 @@ 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 - OS=ubuntu DIST=xenial - OS=ubuntu DIST=bionic - - OS=ubuntu DIST=cosmic - OS=ubuntu DIST=disco + - OS=ubuntu DIST=eoan - OS=debian DIST=jessie - OS=debian DIST=stretch - OS=debian DIST=buster - 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=ubuntu DIST=eoan ARCH=i386 - OS=debian DIST=jessie ARCH=i386 - OS=debian DIST=stretch ARCH=i386 - OS=debian DIST=buster ARCH=i386 @@ -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 @@ -66,10 +69,10 @@ 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=ubuntu DIST=eoan + compiler: clang - env: OS=debian DIST=jessie compiler: clang - env: OS=debian DIST=stretch @@ -82,10 +85,10 @@ 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=ubuntu DIST=eoan ARCH=i386 + compiler: clang - env: OS=debian DIST=jessie ARCH=i386 compiler: clang - env: OS=debian DIST=stretch ARCH=i386 @@ -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 @@ -108,10 +113,10 @@ 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=ubuntu DIST=eoan + os: osx - env: OS=debian DIST=jessie os: osx - env: OS=debian DIST=stretch 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/scripts/buildpack.sh b/scripts/buildpack.sh index ab51d31..b3e84e5 100755 --- a/scripts/buildpack.sh +++ b/scripts/buildpack.sh @@ -49,12 +49,13 @@ 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" "ubuntu bionic x86_64" - "ubuntu cosmic x86_64" "ubuntu disco x86_64" + "ubuntu eoan x86_64" "debian jessie x86_64" "debian stretch x86_64" "debian buster x86_64" @@ -63,8 +64,8 @@ distros_x86_64=( distros_i386=( "ubuntu xenial i386" "ubuntu bionic i386" - "ubuntu cosmic i386" "ubuntu disco i386" + "ubuntu eoan i386" "debian jessie i386" "debian stretch i386" "debian buster i386" @@ -75,8 +76,8 @@ distros_aarch64=( "fedora 29 aarch64" "fedora 30 aarch64" "ubuntu bionic aarch64" - "ubuntu cosmic aarch64" "ubuntu disco aarch64" + "ubuntu eoan aarch64" "ubuntu xenial aarch64" "debian jessie aarch64" "debian stretch aarch64" diff --git a/tests/test_run.sh b/tests/test_run.sh index a90f533..669ed75 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 $(command -v python >/dev/null 2>&1) +then + PYTHON=python +elif $(command -v python2 >/dev/null 2>&1) +then + PYTHON=python2 +else + echo "Cannot find python interpreter in PATH" + exit 1 +fi + +$PYTHON $(command -v cram) --shell=/bin/bash --verbose $tests