Clean up scripts related to CI and Docker

diff --git a/ci/build b/ci/build
index 3b42db632d628dc248a3c69536362da2b6459d94..9cc44297d23f9e3b46940a632ea6dd7643cfc344 100755 (executable)
--- a/ci/build
+++ b/ci/build
@@ -1,15 +1,21 @@
-#!/bin/sh -ex
-# This script is used by .travis.yml and build-in-docker
+#!/bin/sh
+#
+# This script is used by .travis.yml and build-in-docker.
 
-if [ -n "${SPECIAL}" ]; then
-  sh ci/${SPECIAL}
+set -eu
+
+if [ -n "${VERBOSE:-}" ]; then
+    set -x
+fi
+
+if [ -n "${SPECIAL:-}" ]; then
+    exec "ci/$SPECIAL"
 else
-  mkdir -p ${BUILDDIR:-build}
-  cd ${BUILDDIR:-build}
-  ${CMAKE_PREFIX:-} cmake ${CCACHE_LOC:-..} ${CMAKE_PARAMS:-}
-  # 4 threads seems a reasonable default for Travis
-  ${CMAKE_PREFIX:-} cmake --build . ${BUILDEXTRAFLAGS:-} -- -j4
-  # Warning: Rare random failures when running with j4.
-  test "${RUN_TESTS:-1}" -eq "1" && ctest --output-on-failure -j1
+    mkdir -p ${BUILDDIR:-build}
+    cd ${BUILDDIR:-build}
+    ${CMAKE_PREFIX:-} cmake "${CCACHE_LOC:-..}" ${CMAKE_PARAMS:-}
+    # 4 jobs seem to be a reasonable default for Travis.
+    ${CMAKE_PREFIX:-} cmake --build . ${BUILDEXTRAFLAGS:-} -- -j4
+    # Warning: Rare random failures when running with -j4.
+    [ "${RUN_TESTS:-1}" -ne "1" ] || ctest --output-on-failure -j1
 fi
-exit 0

diff --git a/ci/build-and-verify-package b/ci/build-and-verify-package
index bdf6acd8c51ee5fbeaf484819d280fee85b27f64..3dfffa8fc154471c26724f64515b78ab08b59cfe 100755 (executable)
--- a/ci/build-and-verify-package
+++ b/ci/build-and-verify-package
@@ -1,20 +1,19 @@
-#!/bin/sh -ex
+#!/bin/sh
 
-echo "Warning: Binary package support is rather experimental\n"
+set -eu
 
+rm -rf build_package_dir_test
 mkdir -p build_package_dir_test
 cd build_package_dir_test
-rm -rf *
 cmake ..
 cmake --build . --target package
 
 # get out of git directory just to be sure
 tmp_dir=$(mktemp -d)
+trap "rm -rf $tmp_dir" EXIT
 
 tar -xzf ccache-binary.tar.gz -C $tmp_dir
 
 CCACHE=$tmp_dir/ccache-binary/bin/ccache ../test/run
 
-rm -rf $tmp_dir
-
-echo "\n\nbinary package is fine and can be used!\n\n"
+echo "Binary package is fine and can be used."

diff --git a/ci/build-and-verify-package-source b/ci/build-and-verify-package-source
index 221f813dc0bee95ab03280c80cda58fb76899cf2..69152dfa3ecdb473ddd5e41574f0dd4ca6fa3d00 100755 (executable)
--- a/ci/build-and-verify-package-source
+++ b/ci/build-and-verify-package-source
@@ -1,26 +1,25 @@
-#!/bin/sh -ex
+#!/bin/sh
 
-echo "Warning: Source package support is rather experimental\n"
+set -eu
 
+rm -rf build_package_source_dir_test
 mkdir -p build_package_source_dir_test
 cd build_package_source_dir_test
-rm -rf *
 cmake ..
 cmake --build . --target package_source
 
 # get out of git directory
 # Unfortunately this random name will prevent ccache from caching results...
-# ToDo: use '../../temp' instead?
+# TODO: use '../../temp' instead?
 tmp_dir=$(mktemp -d)
+trap "rm -rf $tmp_dir" EXIT
 
-tar -xzf ccache-src.tar.gz -C $tmp_dir
-cd $tmp_dir
+tar -xf ccache-src.tar.gz -C $tmp_dir
+cd $tmp_dir/ccache-src
 
 cmake .
 cmake --build . -- -j4
 ctest --output-on-failure -j4
 
-rm -rf $tmp_dir
-
-echo "\n\nsource package is fine and can be used!\n\n"
+echo "Source package is fine and can be used."
 

diff --git a/misc/build-in-docker b/misc/build-in-docker
index 4a7e9d92e517627b290dc1e57145d89c441d0793..597f5490eda989de4e4eeecb7a2f5467321e1058 100755 (executable)
--- a/misc/build-in-docker
+++ b/misc/build-in-docker
@@ -1,16 +1,23 @@
 #!/bin/bash
-
-# This script runs ci/build in a Docker container.
-#
-# Usage:
-#
-#   build-in-docker NAME [ARGUMENTS]
 #
-# NAME: Sudirectory name in the dockerfiles directory.
-# ARGUMENTS: Arguments that will be passed to ci/build.
+# This script runs ci/build in a Docker container.
+
+if [ $# -eq 0 ] || [ ${1:-} = -h ] || [ ${1:-} = --help ]; then
+    cat <<EOF
+Usage: build-in-docker NAME [ARGUMENTS]
+
+NAME: Subdirectory name in the dockerfiles directory.
+ARGUMENTS: Arguments that will be passed to ci/build.
+EOF
+    exit 1
+fi
 
 set -eu
 
+if [ -n "${VERBOSE:-}" ]; then
+    set -x
+fi
+
 name=${1}
 shift
 
@@ -24,22 +31,22 @@ mkdir -p build-in-docker
 mkdir -p build-in-docker/docker-ccache
 
 docker run --rm \
-  --volume "$PWD:/source" \
-  --volume "$PWD/build-in-docker/docker-ccache:/ccache" \
-  --tmpfs /builddir:rw,exec \
-  --workdir /builddir \
-  --env CC="${CC:-}" \
-  --env CFLAGS="${CFLAGS:-}" \
-  --env CXX="${CXX:-}" \
-  --env CXXFLAGS="${CXXFLAGS:-}" \
-  --env LDFLAGS="${LDFLAGS:-}" \
-  --env ASAN_OPTIONS="${ASAN_OPTIONS:-}" \
-  --env CCACHE_LOC="/source" \
-  --env SPECIAL="${SPECIAL:-}" \
-  --env SCAN_BUILD="${SCAN_BUILD:-}" \
-  --env CMAKE_PARAMS="${CMAKE_PARAMS:-}" \
-  --env BUILDEXTRAFLAGS="${BUILDEXTRAFLAGS:-}" \
-  --env NO_TEST="${NO_TEST:-}" \
-  --env CCACHE_DIR=/ccache \
-  "$tag" \
-  /source/ci/build "$@"
+    --volume "$PWD:/source" \
+    --volume "$PWD/build-in-docker/docker-ccache:/ccache" \
+    --tmpfs /builddir:rw,exec \
+    --workdir /builddir \
+    --env CC="${CC:-}" \
+    --env CFLAGS="${CFLAGS:-}" \
+    --env CXX="${CXX:-}" \
+    --env CXXFLAGS="${CXXFLAGS:-}" \
+    --env LDFLAGS="${LDFLAGS:-}" \
+    --env ASAN_OPTIONS="${ASAN_OPTIONS:-}" \
+    --env CCACHE_LOC="/source" \
+    --env SPECIAL="${SPECIAL:-}" \
+    --env SCAN_BUILD="${SCAN_BUILD:-}" \
+    --env CMAKE_PARAMS="${CMAKE_PARAMS:-}" \
+    --env BUILDEXTRAFLAGS="${BUILDEXTRAFLAGS:-}" \
+    --env NO_TEST="${NO_TEST:-}" \
+    --env CCACHE_DIR=/ccache \
+    "$tag" \
+    /source/ci/build "$@"

diff --git a/misc/test-all-systems b/misc/test-all-systems
index 39d4e84905c07f4413cbb353fd255d3af9480b68..131fee95cefb5d3259679d4b4b10c4cba34c8efe 100755 (executable)
--- a/misc/test-all-systems
+++ b/misc/test-all-systems
@@ -1,51 +1,52 @@
-#!/bin/sh -ex
+#!/bin/sh
 
-# While it's obviously quite impossible to support and test every single distribution,
-# this script enables easy checking of the most common standard distributions at least.
+set -eu
 
-# Runtime is roughly 1 minute per line (depending on system).
-# First run takes about 1 additional minute per docker image (depending on internet connection).
+# While it's obviously quite impossible to support and test every single
+# distribution, this script enables easy checking of the most common standard
+# distributions at least.
 
-# Note: Currently this is more a reference on how to run each instance,
-#       instead of running this entire script at once. See next steps.
+# Note: Currently this is more a reference on how to run each instance, instead
+# of running this entire script at once. See next steps.
 
 # Next steps:
-# * run compilation, tests and/or docker instances in parallel to improve runtime.
-
-echo "Warning: Docker support is rather experimental\n"
+# * Run compilation, tests and/or docker instances in parallel to improve
+#   runtime.
 
 build_in_docker=$(dirname $0)/build-in-docker
 
+# -------------------------------------------------------------------------------
 # Debian
 
-  # See https://github.com/ccache/ccache/issues/602
-  #CC=gcc   CXX=g++     $build_in_docker debian-9-stretch
-  #CC=clang CXX=clang++ $build_in_docker debian-9-stretch
-
-  CC=gcc   CXX=g++     $build_in_docker debian-10-buster
-  CC=clang CXX=clang++ $build_in_docker debian-10-buster
+# See https://github.com/ccache/ccache/issues/602
+#CC=gcc   CXX=g++     $build_in_docker debian-9-stretch
+#CC=clang CXX=clang++ $build_in_docker debian-9-stretch
 
+CC=gcc   CXX=g++     $build_in_docker debian-10-buster
+CC=clang CXX=clang++ $build_in_docker debian-10-buster
 
+# -------------------------------------------------------------------------------
 # Ubuntu (ancient, old and latest)
 
-  # zstd not available for Ubuntu 14.
-  CC=gcc   CXX=g++     CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" $build_in_docker ubuntu-14-trusty
-
-  # See https://github.com/ccache/ccache/issues/601
-  #CC=clang CXX=clang++ CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" $build_in_docker ubuntu-14-tusty
+# zstd not available for Ubuntu 14.
+CC=gcc   CXX=g++     CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" $build_in_docker ubuntu-14-trusty
 
-  CC=gcc   CXX=g++     $build_in_docker ubuntu-16-xenial
-  CC=clang CXX=clang++ $build_in_docker ubuntu-16-xenial
+# See https://github.com/ccache/ccache/issues/601
+#CC=clang CXX=clang++ CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" $build_in_docker ubuntu-14-tusty
 
-  CC=gcc   CXX=g++     CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" $build_in_docker ubuntu-20-focal
-  CC=clang CXX=clang++ CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" $build_in_docker ubuntu-20-focal
+CC=gcc   CXX=g++     $build_in_docker ubuntu-16-xenial
+CC=clang CXX=clang++ $build_in_docker ubuntu-16-xenial
 
+CC=gcc   CXX=g++     CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" $build_in_docker ubuntu-20-focal
+CC=clang CXX=clang++ CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" $build_in_docker ubuntu-20-focal
 
+# -------------------------------------------------------------------------------
 # Alpine (old and latest)
 
-  CC=gcc   CXX=g++     CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" $build_in_docker alpine-3.4
-  # Clang is not capable to compile libzstd from internet before alpine 3.12 (Some SSE2 error regarding missing file emmintrin.h)
-  #CC=clang CXX=clang++ CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" $build_in_docker alpine-3.4
-  CC=clang CXX=clang++ CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" $build_in_docker alpine-3.12
-  CC=gcc   CXX=g++     $build_in_docker alpine-3.12
-  CC=clang CXX=clang++ $build_in_docker alpine-3.12
+CC=gcc   CXX=g++     CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" $build_in_docker alpine-3.4
+# Clang is not capable to compile libzstd from internet before alpine 3.12 (some
+# SSE2 error regarding missing file emmintrin.h)
+#CC=clang CXX=clang++ CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" $build_in_docker alpine-3.4
+CC=clang CXX=clang++ CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" $build_in_docker alpine-3.12
+CC=gcc   CXX=g++     $build_in_docker alpine-3.12
+CC=clang CXX=clang++ $build_in_docker alpine-3.12