Skip to content

Commit a5972a9

Browse files
Merge pull request #59 from edenlabllc/feature/FFS-944-add-increment-to-RC-releases-version
extend version validation for numbered RCs
2 parents 4081983 + e063b83 commit a5972a9

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
fetch-depth: 0
5050

5151
- name: Run Tenant Artifact CI Action
52-
uses: edenlabllc/tenant.artifact.ci.action@v1
52+
uses: edenlabllc/tenant.artifact.ci.action@v3
5353
with:
5454
github_token_repo_full_access: ${{ secrets.GH_TOKEN_REPO_FULL_ACCESS }}
5555
autotag: true

src/actions/github_project_manager.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def __init__(self, args: Namespace, github_context: GitHubContext):
2727
if self.git_branch == (self.args.major_version_branch or "").strip():
2828
self.VERSION_REGEX = fr"v\d+\.\d+\.\d+-{self.args.major_version_branch}$"
2929
else:
30-
self.VERSION_REGEX = r"v\d+\.\d+\.\d+(?:-rc)?$"
30+
self.VERSION_REGEX = r"v\d+\.\d+\.\d+(?:-rc(?:\.\d+)?)?$"
3131

3232
''' Validate major version branch format if provided '''
3333
if (self.args.major_version_branch or "").strip():
@@ -134,7 +134,7 @@ def _handle_master_branch(self):
134134
if not match:
135135
err_message = (f"Invalid commit message for branch '{self.git_branch}'.\n"
136136
f"Expected formats:\n"
137-
f"- release|hotfix/vX.Y.Z|vX.Y.Z-rc")
137+
f"- release|hotfix/vX.Y.Z|vX.Y.Z-rc|vX.Y.Z-rc.N")
138138
if (self.args.major_version_branch or "").strip():
139139
raise ValueError(err_message +
140140
f"\n- {self.args.major_version_branch}: release|hotfix/vX.Y.Z-{self.args.major_version_branch}"

0 commit comments

Comments
 (0)