CU-8699j8f1r Update release workflow for MedCAT v2 (#5)

* CU-8699j8f1r: Update release branch to reflect the service (i.e MedCAT)

* CU-8699j8f1r: Update release tag to indicate service being released

* CU-8699j8f1r: Update MedCAT release workflow to run upon correct tag pushes

* CU-8699j8f1r: Update version tag getting in worklfow

* CU-8699j8f1r: Fix comment regarding release branch name in wokrflow

* CU-8699j8f1r: Move to medcat/v<major>.<minor> release branches

Author: mart-r

.github/workflows/medcat-v2_release.yml

@@ -3,7 +3,7 @@ name: medcat-v2 - Build Python Package
 on:
   push:
     tags:
-      - "v*"
+      - "medcat/v*"
 
 permissions:
   contents: write
@@ -27,13 +27,11 @@ jobs:
           git fetch --all
 
           # Get the tag without the 'v' and strip the patch version
-          VERSION_TAG="${GITHUB_REF#refs/tags/v}"
-          VERSION_MAJOR_MINOR="${VERSION_TAG%.*}"  # This removes the patch version (everything after the second dot)
+          VERSION_TAG="${GITHUB_REF#refs/tags/}"
+          # NOTE: branch name is in line with version tag, except for the patch version
+          BRANCH_NAME="${VERSION_TAG%.*}"  # This removes the patch version (everything after the second dot)
 
-          # Construct the branch name (e.g., release/0.1)
-          BRANCH_NAME="release/$VERSION_MAJOR_MINOR"
-
-          # Check out the corresponding release branch (e.g., release/0.1)
+          # Check out the corresponding release branch (e.g., medcat/v0.1)
           git checkout $BRANCH_NAME
 
           # Ensure the branch is up-to-date with the remote

medcat-v2/.release/prepare_minor_release.sh

@@ -23,11 +23,12 @@ if [[ ! "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
     echo "Error: version '$VERSION' must be in format X.Y.Z"
     exit 1
 fi
+VERSION_TAG="medcat/v$VERSION"
 
 # Extract version components
 VERSION_MAJOR_MINOR="${VERSION%.*}"
 VERSION_PATCH="${VERSION##*.}"
-RELEASE_BRANCH="release/$VERSION_MAJOR_MINOR"
+RELEASE_BRANCH="medcat/v$VERSION_MAJOR_MINOR"
 
 # Helpers
 run_or_echo() {
@@ -53,8 +54,8 @@ if git show-ref --quiet "refs/heads/$RELEASE_BRANCH" && [[ $FORCE == false ]]; t
     error_exit "Branch '$RELEASE_BRANCH' already exists. Use --force to override."
 fi
 
-if git show-ref --quiet "refs/tags/v$VERSION" && [[ $FORCE == false ]]; then
-    error_exit "Tag 'v$VERSION' already exists. Use --force to override."
+if git show-ref --quiet "refs/tags/$VERSION_TAG" && [[ $FORCE == false ]]; then
+    error_exit "Tag '$VERSION_TAG' already exists. Use --force to override."
 fi
 
 if [[ -n "$(git status --porcelain)" ]]; then
@@ -78,8 +79,8 @@ run_or_echo git add pyproject.toml
 run_or_echo git commit -m \"Bump version to $VERSION for release\"
 
 # Create and push tag
-run_or_echo git tag -a \"v$VERSION\" -m \"Release v$VERSION\"
+run_or_echo git tag -a \"$VERSION_TAG\" -m \"Release v$VERSION\"
 run_or_echo git push origin \"$RELEASE_BRANCH\"
-run_or_echo git push origin \"v$VERSION\"
+run_or_echo git push origin \"$VERSION_TAG\"
 
 run_or_echo git checkout main

medcat-v2/.release/prepare_patch_release.sh

@@ -46,11 +46,12 @@ if [[ ! "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
     echo "Error: version '$VERSION' must be in format X.Y.Z"
     exit 1
 fi
+VERSION_TAG="medcat/v$VERSION"
 
 # Extract version components
 VERSION_MAJOR_MINOR="${VERSION%.*}"
 VERSION_PATCH="${VERSION##*.}"
-RELEASE_BRANCH="release/$VERSION_MAJOR_MINOR"
+RELEASE_BRANCH="medcat/v$VERSION_MAJOR_MINOR"
 
 # some prerequisites
 [[ "$VERSION_PATCH" == "0" ]] && error_exit "Patch version must not be 0."
@@ -61,8 +62,8 @@ if ! git show-ref --verify --quiet "refs/remotes/origin/$RELEASE_BRANCH"; then
     error_exit "Release branch '$RELEASE_BRANCH' does not exist remotely."
 fi
 
-if git rev-parse "v$VERSION" >/dev/null 2>&1 && ! $FORCE; then
-    error_exit "Tag 'v$VERSION' already exists. Use --force to override."
+if git rev-parse "$VERSION_TAG" >/dev/null 2>&1 && ! $FORCE; then
+    error_exit "Tag '$VERSION_TAG' already exists. Use --force to override."
 fi
 
 if [[ -n "$(git status --porcelain)" && ! $FORCE ]]; then
@@ -82,9 +83,9 @@ if $MANUAL; then
     echo "  sed -i 's/version = \".*\"/version = \"$VERSION\"/' pyproject.toml"
     echo "  git add pyproject.toml"
     echo "  git commit -m 'Bump version to $VERSION'"
-    echo "  git tag -a v$VERSION -m 'Release v$VERSION'"
+    echo "  git tag -a $VERSION_TAG -m 'Release v$VERSION'"
     echo "  git push origin $RELEASE_BRANCH"
-    echo "  git push origin v$VERSION"
+    echo "  git push origin $VERSION_TAG"
     exit 0
 fi
 
@@ -162,9 +163,9 @@ run_or_echo git commit -m \"Bump version to $VERSION\" --allow-empty
 # now do the tagging
 # NOTE: can force since without the `--force` flag we would have checked
 #       for existing tag
-run_or_echo git tag -a \"v$VERSION\" -m \"Release v$VERSION\" --force
+run_or_echo git tag -a \"$VERSION_TAG\" -m \"Release v$VERSION\" --force
 run_or_echo git push origin \"$RELEASE_BRANCH\"
-run_or_echo git push origin \"v$VERSION\" --force
+run_or_echo git push origin \"$VERSION_TAG\" --force
 
 run_or_echo git checkout main