From 5915caff2138cc78de68a3821c5b1d9ab24da50a Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 21 Sep 2023 10:40:51 +0200 Subject: [PATCH] ci-automation/image-changes: Set NEW_VERSION in toplevel function This avoid assuming that the current working directory in the generate_image_changes_report function is actually toplevel directory of the scripts repo. --- ci-automation/image_changes.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ci-automation/image_changes.sh b/ci-automation/image_changes.sh index a6c9b0920e..2daaa87292 100644 --- a/ci-automation/image_changes.sh +++ b/ci-automation/image_changes.sh @@ -68,7 +68,9 @@ function image_changes() ( "PORTAGE_STABLE_REPO=../portage-stable" ) show_changes_params_overrides=( - # Nothing to override. + # The show-changes script expects a tag name, so using git tag + # here instead of the vernum variable. + "NEW_VERSION=$(git tag --points-at HEAD)" ) local fbs_repo='../flatcar-build-scripts' @@ -205,9 +207,6 @@ function generate_image_changes_report() ( # Nothing to prepend to show_changes_env. show_changes_params=( - # The show-changes script expects a tag name, so using git tag - # here instead of the vernum variable. - "NEW_VERSION=$(git tag --points-at HEAD)" "NEW_CHANNEL=${new_channel}" "NEW_CHANNEL_PREV_VERSION=${new_channel_prev_version}" # Potential overrides.