From f99c1dda4196106ef209b538d9f25ae19314e39a Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Thu, 12 Dec 2024 11:01:17 +0200 Subject: [PATCH] scripts/update-gh-pages: fix release version parsing When determining the release branch only consider "main" release tags, refusing to pick api/nfd/v* tags. (cherry picked from commit a416af51a48d5d49cc0f17b069b3fc6e8566bedd) --- scripts/github/update-gh-pages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/github/update-gh-pages.sh b/scripts/github/update-gh-pages.sh index 44515c706d..f3e3ba553d 100755 --- a/scripts/github/update-gh-pages.sh +++ b/scripts/github/update-gh-pages.sh @@ -105,7 +105,7 @@ site_subdir=${site_subdir:-master} # Check if this ref is for a released version if [ "$site_subdir" != "master" ]; then - _base_tag=`git describe --abbrev=0 || :` + _base_tag=`git describe --abbrev=0 --match "v*" || :` case "$_base_tag" in $site_subdir*) ;;