diff --git a/.github/workflows/medcat-v2_release.yml b/.github/workflows/medcat-v2_release.yml index f3f26cf61..e7a91603b 100644 --- a/.github/workflows/medcat-v2_release.yml +++ b/.github/workflows/medcat-v2_release.yml @@ -30,6 +30,7 @@ jobs: 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) + BRANCH_NAME="${BRANCH_NAME//-//}" # this replaces the - in the version tag with the / in the release branch # Check out the corresponding release branch (e.g., medcat-v0.1) git checkout $BRANCH_NAME diff --git a/medcat-v2/.release/README.md b/medcat-v2/.release/README.md index 363fa794b..20eb1faa2 100644 --- a/medcat-v2/.release/README.md +++ b/medcat-v2/.release/README.md @@ -4,7 +4,7 @@ The scripts within here are designed to help preparing for and dealing with rele The main idea is to use the `prepare_release.sh` script from within the root of the project and it will delegate either to `prepare_minor_release.sh` or `prepare_patch_release.sh` as necessary. The workflow within the scripts is as follows: -- Create or check out release branch (`release/v.`) +- Create or check out release branch (`medcat/v.`) - Update version in `pyproject.toml` - Create a tag based on the version - Push both the branch as well as the tag to `origin` diff --git a/medcat-v2/.release/prepare_minor_release.sh b/medcat-v2/.release/prepare_minor_release.sh index 5ba53c31e..cc905affe 100644 --- a/medcat-v2/.release/prepare_minor_release.sh +++ b/medcat-v2/.release/prepare_minor_release.sh @@ -23,7 +23,7 @@ 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" +VERSION_TAG="medcat-v$VERSION" # Extract version components VERSION_MAJOR_MINOR="${VERSION%.*}" diff --git a/medcat-v2/.release/prepare_patch_release.sh b/medcat-v2/.release/prepare_patch_release.sh index 6ed7a79cf..ef5fd6c79 100644 --- a/medcat-v2/.release/prepare_patch_release.sh +++ b/medcat-v2/.release/prepare_patch_release.sh @@ -46,7 +46,7 @@ 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" +VERSION_TAG="medcat-v$VERSION" # Extract version components VERSION_MAJOR_MINOR="${VERSION%.*}"