lava: Wait until time is synchronised during test suite cleanup

[lttng-ci.git] / scripts / babeltrace / release.sh

diff --git a/scripts/babeltrace/release.sh b/scripts/babeltrace/release.sh
index 43db8dbe0903faae3b8590da820c00dd89010c17..c120a8b30fbce16c54d7ee48b857c0e950b15525 100644 (file)
--- a/scripts/babeltrace/release.sh
+++ b/scripts/babeltrace/release.sh
@@ -1,7 +1,7 @@
-#!/bin/bash -exu
+#!/bin/bash
 #
 # Copyright (C) 2015 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
-# Copyright (C) 2020 Michael Jeanson <mjeanson@efficios.com>
+# Copyright (C) 2023 Michael Jeanson <mjeanson@efficios.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,6 +16,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+set -exu
+
 # Version compare functions
 vercomp () {
     set +u
@@ -23,6 +25,8 @@ vercomp () {
         return 0
     fi
     local IFS=.
+    # Ignore the shellcheck warning, we want splitting to happen based on IFS.
+    # shellcheck disable=SC2206
     local i ver1=($1) ver2=($2)
     # fill empty fields in ver1 with zeros
     for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)); do
@@ -100,7 +104,7 @@ PACKAGE_VERSION=${PACKAGE_VERSION//\-pre*/}
 # Version specific configurations
 if vergte "$PACKAGE_VERSION" "2.0"; then
   BASENAME="babeltrace2"
-  CONF_OPTS=("--enable-python-bindings" "--enable-python-bindings-doc" "--enable-python-plugins")
+  CONF_OPTS=("--enable-python-bindings" "--enable-python-bindings-doc" "--enable-python-plugins" "--disable-Werror")
 
   # Enable dev mode by default for BT 2.0 builds
   #export BABELTRACE_DEBUG_MODE=1
@@ -116,7 +120,7 @@ TARBALL_FILE="$BASENAME-$PACKAGE_VERSION.tar.bz2"
 
 
 # Make sure the reported version matches the current git tag
-GIT_TAG="$(git describe --exact-match --tags $(git log -n1 --pretty='%h')|| echo 'undefined')"
+GIT_TAG="$(git describe --exact-match --tags "$(git log -n1 --pretty='%h')" || echo 'undefined')"
 
 if [ "v$PACKAGE_VERSION" != "$GIT_TAG" ]; then
   echo "Git checkout is not tagged or doesn't match the reported version."
@@ -124,7 +128,7 @@ if [ "v$PACKAGE_VERSION" != "$GIT_TAG" ]; then
 fi
 
 # Generate release tarball
-./configure "${CONF_OPTS[@]}"
+./configure
 make dist
 cp "./$TARBALL_FILE" "$OUTDIR/"