From 70b920ecb4a7f3a5dd779f6cb6a208560d304d18 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 16 Sep 2025 16:30:32 +0300 Subject: [PATCH] Update patch-lua to support tags --- config.yaml | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/config.yaml b/config.yaml index 1a07dd4..f3f5b66 100644 --- a/config.yaml +++ b/config.yaml @@ -20,16 +20,24 @@ actions: and posix.access(sourcedir .. '/.git/.', 'x'))) local commit_marker_contents -- For git_commit_file. - -- If the branch is AlmaLinux branch, then we need to get history of Upstream - -- branch, and skip all AlmaLinux-specific commits. To avoid duplicates + -- If the branch/tag is AlmaLinux, then we need to get history of Upstream + -- branch/tag, and skip all AlmaLinux-specific commits. To avoid duplicates -- in changelog and bumped release numbers - local branch = string.match(run_git('rev-parse --abbrev-ref HEAD'), '([^\n]+)') - local log_branch = branch - local anum = string.match(branch, '^a(%d+)s$') - if anum then - log_branch = 'c' .. anum .. 's' - else - log_branch = 'HEAD' + if have_git then + local log_branch = string.match(run_git('rev-parse --abbrev-ref HEAD'), '([^\n]+)') + if log_branch == 'HEAD' then + log_branch = string.match(run_git('describe --tags --exact-match'), '([^\n]+)') + local anum, aname = string.match(log_branch, '^changed/a(%d+s?)/(.+)$') + local cname = string.gsub(aname, '%.alma%.[0-9]+$', '') + log_branch = 'imports/c' .. anum .. '/' .. cname + else + local anum = string.match(log_branch, '^a(%d+s?)$') + if anum then + log_branch = 'c' .. anum + else + log_branch = 'HEAD' + end + end end count: 1 - target: "patch-git.lua"