From 88275ad0daf42f1b7b7ba0c8c79b5ebd37229675 Mon Sep 17 00:00:00 2001
From: Green Sky <Green-Sky@users.noreply.github.com>
Date: Sat, 1 Nov 2025 22:26:14 +0100
Subject: [PATCH] refactor tag nameing and update

---
 .github/workflows/cd.yml           | 39 +++++++-----------------------
 .github/workflows/tag_version.bash | 10 ++++++++
 2 files changed, 19 insertions(+), 30 deletions(-)
 create mode 100755 .github/workflows/tag_version.bash

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index d7c0d4f..0f1b3d1 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -17,9 +17,10 @@ jobs:
     runs-on: ubuntu-24.04
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         submodules: recursive
+        fetch-depth: 0
 
     - name: Install Dependencies
       run: sudo apt update && sudo apt -y install libsodium-dev
@@ -33,15 +34,7 @@ jobs:
     - name: Determine tag name
       id: tag
       shell: bash
-      # taken from llama.cpp
-      run: |
-        SHORT_HASH="$(git rev-parse --short=7 HEAD)"
-        if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
-          echo "name=dev-${SHORT_HASH}" >> $GITHUB_OUTPUT
-        else
-          SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
-          echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
-        fi
+      run: . .github/workflows/tag_version.bash
 
     - name: Compress artifacts
       shell: bash
@@ -68,9 +61,10 @@ jobs:
         os: ['windows-2022']
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         submodules: recursive
+        fetch-depth: 0
 
     - name: Restore vcpkg cache
       id: vcpkg-cache
@@ -99,15 +93,7 @@ jobs:
     - name: Determine tag name
       id: tag
       shell: bash
-      # taken from llama.cpp
-      run: |
-        SHORT_HASH="$(git rev-parse --short=7 HEAD)"
-        if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
-          echo "name=dev-${SHORT_HASH}" >> $GITHUB_OUTPUT
-        else
-          SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
-          echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
-        fi
+      run: . .github/workflows/tag_version.bash
 
     - name: Clean temporary artifacts
       # msvc sometimes produces .ilk files, which are used for linking only
@@ -144,22 +130,15 @@ jobs:
       contents: write
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         submodules: recursive
+        fetch-depth: 0
 
     - name: Determine tag name
       id: tag
       shell: bash
-      # taken from llama.cpp
-      run: |
-        SHORT_HASH="$(git rev-parse --short=7 HEAD)"
-        if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
-          echo "name=dev-${SHORT_HASH}" >> $GITHUB_OUTPUT
-        else
-          SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
-          echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
-        fi
+      run: . .github/workflows/tag_version.bash
 
     - name: Download artifacts
       id: download-artifact
diff --git a/.github/workflows/tag_version.bash b/.github/workflows/tag_version.bash
new file mode 100755
index 0000000..329e48a
--- /dev/null
+++ b/.github/workflows/tag_version.bash
@@ -0,0 +1,10 @@
+# taken from llama.cpp
+# needs BRANCH_NAME set
+SHORT_HASH="$(git rev-parse --short=7 HEAD)"
+DEPTH="$(git rev-list --count HEAD)"
+if [[ "${BRANCH_NAME}" == "master" ]]; then
+	echo "name=dev-${DEPTH}-${SHORT_HASH}" >> $GITHUB_OUTPUT
+else
+	SAFE_NAME=$(echo "${BRANCH_NAME}" | tr '/' '-')
+	echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
+fi