From e4c5193945367b2f72dfbbab5ccc9b6b06364e4d Mon Sep 17 00:00:00 2001
From: WarmUpTill <WarmUpTill@web.de>
Date: Mon, 3 Apr 2023 21:03:38 +0200
Subject: [PATCH] CI: Use git tag as version identifier in packaging step

---
 .github/scripts/.build.zsh   | 10 ++++++++--
 .github/scripts/.package.zsh |  9 +++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/.github/scripts/.build.zsh b/.github/scripts/.build.zsh
index 3464129d..ec0fb008 100755
--- a/.github/scripts/.build.zsh
+++ b/.github/scripts/.build.zsh
@@ -170,11 +170,17 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
 
   local product_name
   local product_version
+  local git_tag="$(git describe --tags)"
+
   read -r product_name product_version <<< \
     "$(jq -r '. | {name, version} | join(" ")' ${buildspec_file})"
 
-
-
+  if [[ "${git_tag}" =~ '^([0-9]+\.){0,2}(\*|[0-9]+)$' ]] {
+    log_info "Using git tag as version identifier '${git_tag}'"
+    product_version="${git_tag}"
+  } else {
+    log_info "Using buildspec.json version identifier '${product_version}'"
+  }
 
   case ${host_os} {
     macos)
diff --git a/.github/scripts/.package.zsh b/.github/scripts/.package.zsh
index d3c8015f..3a141151 100755
--- a/.github/scripts/.package.zsh
+++ b/.github/scripts/.package.zsh
@@ -128,9 +128,18 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
 
   local product_name
   local product_version
+  local git_tag="$(git describe --tags)"
+
   read -r product_name product_version <<< \
     "$(jq -r '. | {name, version} | join(" ")' ${project_root}/buildspec.json)"
 
+  if [[ "${git_tag}" =~ '^([0-9]+\.){0,2}(\*|[0-9]+)$' ]] {
+    log_info "Using git tag as version identifier '${git_tag}'"
+    product_version="${git_tag}"
+  } else {
+    log_info "Using buildspec.json version identifier '${product_version}'"
+  }
+
   if [[ ${host_os} == 'macos' ]] {
     autoload -Uz check_packages read_codesign read_codesign_installer read_codesign_pass