From 37fc002e7ce3163c9ebe6f5b803d2d29efd2e467 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Wed, 8 May 2024 12:18:51 +0200 Subject: [PATCH 1/2] (CI) fix logging of debug args --- ci/install-package.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/install-package.sh b/ci/install-package.sh index 25e0e7073..a4320a1b2 100755 --- a/ci/install-package.sh +++ b/ci/install-package.sh @@ -250,7 +250,7 @@ then # Install the package completely branch_string=${BRANCH:+" --try-branch=${BRANCH}"} - echo -e "\e[35;1mtue-get install ros-${PACKAGE} --test-depend${branch_string} --try-branch=PULLREQUEST\e[0m" + echo -e "\e[35;1mtue-get install ros-${PACKAGE} --test-depend${branch_string} --try-branch=PULLREQUEST ${ADDITIONAL_ARGS_TUE_GET[*]}\e[0m" docker exec -t tue-env bash -c 'source ~/.bashrc; tue-get install ros-"${PACKAGE}" --test-depend --try-branch="${BRANCH}" --try-branch=PULLREQUEST '"${ADDITIONAL_ARGS_TUE_GET[*]}" # Checkout -f to be really sure @@ -259,7 +259,7 @@ then else # Install the package branch_string=${BRANCH:+" --try-branch=${BRANCH}"} - echo -e "\e[35;1mtue-get install ros-${PACKAGE} --test-depend${branch_string}\e[0m" + echo -e "\e[35;1mtue-get install ros-${PACKAGE} --test-depend${branch_string} ${ADDITIONAL_ARGS_TUE_GET[*]}\e[0m" docker exec -t tue-env bash -c 'source ~/.bashrc; tue-get install ros-"${PACKAGE}" --test-depend --try-branch="${BRANCH}" '"${ADDITIONAL_ARGS_TUE_GET[*]}" # Set the package to the right commit From 2ef5508221592f3bf73f7b02d7d7485a303ff6ef Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Wed, 8 May 2024 12:19:08 +0200 Subject: [PATCH 2/2] Bump VERSION to 1.25.8 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index f1968aa88..e6a6e7cd3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.25.7 +1.25.8