From 18653d9ef45baa4b1c61c8c0a0bcffc27c33d1ce Mon Sep 17 00:00:00 2001
From: Jelle Spijker <jelle.spijker@ultimaker.com>
Date: Tue, 6 Jun 2023 08:33:03 +0200
Subject: [PATCH] Use SHA of the commit instead of no_commits since last tag

We determine the version of a conan package based on a Git tag and then count the number of commits between the last tag
and the current tag to get the +testing_6 or +testing_13 after the alpha/beta designation etc.
This will give us logical sequential numbers with which we can determine which version was later.
But the method can't take into account tags created on release branches, a branch parallel to the main branch, once
these are merged, after a tag then suddenly the first tag it encounters is closer then it was before, this means that we
then accidentally create a second package with the same version and this starts tripping things up.
 Now these logical statements aren't necessary to determine the latest version, according to semver everything after the
  + is ignored and both versions should be compatible.
An easy fix is to replace the testing_<no_of_commits_since_last_tag> with testing_<commit_hash> that way we don't have
two conan packages created from different commits anymore, which is the most common root cause of our problems in this
flow.
---
 .github/workflows/conan-recipe-version.yml | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml
index 78ff37b712..afa09a6d50 100644
--- a/.github/workflows/conan-recipe-version.yml
+++ b/.github/workflows/conan-recipe-version.yml
@@ -77,7 +77,7 @@ jobs:
             -   name: Setup Python and pip
                 uses: actions/setup-python@v4
                 with:
-                    python-version: "3.10.x"
+                    python-version: "3.11.x"
                     cache: 'pip'
                     cache-dependency-path: .github/workflows/requirements-conan-package.txt
 
@@ -146,23 +146,19 @@ jobs:
                         
                         if latest_branch_tag:
                             # %% Get the actual version
-                            no_commits = 0
-                            for commit in repo.iter_commits("HEAD"):
-                                if commit == latest_branch_tag.commit:
-                                    break
-                                no_commits += 1
+                            sha_commit = repo.commit().hexsha[:6]
                             latest_branch_version_prerelease = latest_branch_version.pre
                             if latest_branch_version.pre and not "." in str(latest_branch_version.pre):
                                 # The prerealese did not contain a version number, default it to 1
                                 latest_branch_version_prerelease = f"{latest_branch_version.pre}.1"
                             if event_name == "pull_request":
-                                actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{str(latest_branch_version_prerelease).lower()}+{buildmetadata}pr_{issue_number}_{no_commits}"
-                                channel_metadata = f"{channel}_{no_commits}"
+                                actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{str(latest_branch_version_prerelease).lower()}+{buildmetadata}pr_{issue_number}_{sha_commit}"
+                                channel_metadata = f"{channel}_{sha_commit}"
                             else:
                                 if channel in ("stable", "_", ""):
-                                    channel_metadata = f"{no_commits}"
+                                    channel_metadata = f"{sha_commit}"
                                 else:
-                                    channel_metadata = f"{channel}_{no_commits}"
+                                    channel_metadata = f"{channel}_{sha_commit}"
                             if is_release_branch:
                                 if latest_branch_version.pre == "" and branch_version > latest_branch_version:
                                     actual_version = f"{branch_version.major}.{branch_version.minor}.0-beta.1+{buildmetadata}{channel_metadata}"
@@ -178,18 +174,16 @@ jobs:
                                     actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{str(latest_branch_version.pre).split('.')[0]}.{bump_up_release_tag}+{buildmetadata}{channel_metadata}"
                             else:
                                 max_branches_version = Version("0.0.0")
-                                branches_no_commits = no_commits
                                 for branch in repo.references:
                                     try:
                                         if "remotes/origin" in branch.abspath:
                                             b_version = Version(branch.name.split("/")[-1])
                                             if b_version <  Version("6.0.0") and b_version > max_branches_version:
                                                 max_branches_version = b_version
-                                                branches_no_commits = repo.commit().count() - branch.commit.count()
                                     except:
                                         pass
                                 if max_branches_version > latest_branch_version:
-                                    actual_version = f"{max_branches_version.major}.{int(str(max_branches_version.minor)) + 1}.0-alpha+{buildmetadata}{channel}_{branches_no_commits}"
+                                    actual_version = f"{max_branches_version.major}.{int(str(max_branches_version.minor)) + 1}.0-alpha+{buildmetadata}{channel}_{sha_commit}"
                                 else:
                                     actual_version = f"{latest_branch_version.major}.{int(str(latest_branch_version.minor)) + 1}.0-alpha+{buildmetadata}{channel_metadata}"