From 6ee1cdb7f2902ab421b5c8fa5794c96363c5d274 Mon Sep 17 00:00:00 2001
From: Ognyan Stoimenov <ostoimenov@icloud.com>
Date: Fri, 21 Feb 2025 11:05:45 +0200
Subject: [PATCH 1/2] Remove sha from naming and only use increasing dev
 versions

---
 ...d_release.create_developmental_release.yml | 36 ++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/automated_release.create_developmental_release.yml b/.github/workflows/automated_release.create_developmental_release.yml
index 6d39c6904a..54e83bd011 100644
--- a/.github/workflows/automated_release.create_developmental_release.yml
+++ b/.github/workflows/automated_release.create_developmental_release.yml
@@ -27,15 +27,43 @@ jobs:
     with:
       regex: ^v\d+\.\d+\.\d+rc\d+$
       from_branch: ${{ needs.get-master-sha.outputs.sha }}
-
+      
+  get-dev-number:
+    name: Get dev number
+    needs: calculate-next-version
+    runs-on: ubuntu-latest
+    outputs:
+      next_dev_number: ${{ steps.next-number.outputs.next_dev_number }}
+    steps:
+      - name: Get latest dev tag
+        id: latest_tag
+        uses: oprypin/find-latest-tag@v1
+        with:
+          repository: ${{ github.repository }}
+          prefix: v${{ needs.calculate-next-version.outputs.version }}.dev
+          sort-tags: true
+        continue-on-error: true
+      
+      - name: Calculate next dev number
+        id: next-number
+        run: |
+          if [ -z "${{ steps.latest_tag.outputs.tag }}" ]; then
+            next_dev_number=0
+          else
+            LATEST_TAG="${{ steps.latest_tag.outputs.tag }}"
+            LATEST_TAG="${LATEST_TAG#v${{ needs.calculate-next-version.outputs.version }}.dev}"
+            next_dev_number=$((LATEST_TAG + 1))
+          fi
+          echo "next_dev_number=$next_dev_number" >> $GITHUB_OUTPUT
+    
   rc_release:
-    name: Tag and Release version ${{ needs.calculate-next-version.outputs.version }}.dev0+${{ needs.get-master-sha.outputs.sha }} from branch master(${{ needs.get-master-sha.outputs.sha }}) 
+    name: Tag and Release version ${{ needs.calculate-next-version.outputs.version }}.dev${{ needs.get-dev-number.outputs.next_dev_number }} from branch master(${{ needs.get-master-sha.outputs.sha }}) 
     secrets: inherit
     permissions:
       checks: read
       contents: write
     uses: ./.github/workflows/tag.yml
-    needs: [calculate-next-version, get-master-sha]
+    needs: [calculate-next-version, get-master-sha, get-dev-number]
     with:
-      version: ${{ needs.calculate-next-version.outputs.version }}.dev0+${{ needs.get-master-sha.outputs.sha }}
+      version: ${{ needs.calculate-next-version.outputs.version }}.dev${{ needs.get-dev-number.outputs.next_dev_number }}
       from_branch: master

From 5bd2d691bcc3e68fa6a92c0dde7cc9f61dad0ffa Mon Sep 17 00:00:00 2001
From: Ognyan Stoimenov <ostoimenov@icloud.com>
Date: Fri, 21 Feb 2025 12:11:38 +0200
Subject: [PATCH 2/2] Checkout correctly

---
 .github/workflows/tag.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
index a74a16251b..59b25764b4 100644
--- a/.github/workflows/tag.yml
+++ b/.github/workflows/tag.yml
@@ -45,6 +45,7 @@ jobs:
         uses: actions/checkout@v3.3.0
         with:
           token: ${{secrets.TAGGING_TOKEN}}
+          ref: ${{ env.FROM_BRANCH }}
 
       - name: Tag required version
         run: |