mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-11-29 14:31:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

ci-automation/image-changes: Set NEW_VERSION in toplevel function

Browse Source 
This avoid assuming that the current working directory in the
generate_image_changes_report function is actually toplevel directory
of the scripts repo.
This commit is contained in:
Krzesimir Nowak 2023-09-21 10:40:51 +02:00
parent ffa2bfc695
commit 5915caff21
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ci-automation/image_changes.sh
View File

@ -68,7 +68,9 @@ function image_changes() (
"PORTAGE_STABLE_REPO=../portage-stable" "PORTAGE_STABLE_REPO=../portage-stable"
) )
show_changes_params_overrides=( 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' local fbs_repo='../flatcar-build-scripts'
@ -205,9 +207,6 @@ function generate_image_changes_report() (
# Nothing to prepend to show_changes_env. # Nothing to prepend to show_changes_env.
show_changes_params=( 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=${new_channel}"
"NEW_CHANNEL_PREV_VERSION=${new_channel_prev_version}" "NEW_CHANNEL_PREV_VERSION=${new_channel_prev_version}"
# Potential overrides. # Potential overrides.