From 9a4fb2a8071ad65aae712bafa227453d92feae16 Mon Sep 17 00:00:00 2001 From: sfinke0 Date: Sun, 10 Mar 2024 22:15:41 +0100 Subject: T6115: fix failing builds from detached HEAD (e.g. git tags) (cherry picked from commit 3494ab3e0a50ed701a4b127e51b919c2ceb61bc3) --- scripts/build-vyos-image | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/build-vyos-image b/scripts/build-vyos-image index 6bfe3faa..94fedf62 100755 --- a/scripts/build-vyos-image +++ b/scripts/build-vyos-image @@ -273,8 +273,12 @@ if __name__ == "__main__": if repo.is_dirty(): build_git += "-dirty" - # Retrieve git branch name - git_branch = repo.active_branch.name + # Retrieve git branch name or current tag + # Building a tagged release might leave us checking out a git tag that is not the tip of a named branch (detached HEAD) + # Check if the current HEAD is associated with a tag and use its name instead of an unavailable branch name. + git_branch = next((tag.name for tag in repo.tags if tag.commit == repo.head.commit), None) + if git_branch is None: + git_branch = repo.active_branch.name except Exception as e: exit(f'Could not retrieve information from git: {e}') build_git = "" -- cgit v1.2.3