Skip to content

Commit 6e854cb

Browse files
Merge pull request #52 from edenlabllc/feature/FFS-50-refactor-tenant-artifactciaction
fix create git tag and release for prepare manual tenant artifact
2 parents d023b5f + bbb4a15 commit 6e854cb

2 files changed

Lines changed: 13 additions & 8 deletions

File tree

main.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@
2121
print(f"Artifact_version: {project_manager.version}")
2222

2323
"""Create Tag and Release"""
24-
if args.autotag or args.push_tag:
25-
project_manager.create_git_tag_and_release()
24+
project_manager.create_git_tag_and_release()
2625

2726
"""Update Artifact version in Tenants"""
28-
if github_context.ref_name == "production":
27+
if (github_context.ref_name == "production") or (args.artifact_version or "").strip():
2928
project_update_tenants = ProjectUpdateTenants(args, github_context, project_manager.version)
3029
project_update_tenants.run()
3130
else:

src/actions/github_project_manager.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,12 @@ def create_git_tag_and_release(self):
5353
"""
5454
Creates a Git tag and GitHub release for the current version.
5555
"""
56-
print("Release service (only for staging, production or major version branch).")
56+
if (self.args.artifact_version or "").strip():
57+
print(f"Release service for {self.github_context.ref_name} branch.")
58+
else:
59+
print("Release service (only for staging, production or major version branch).")
5760

58-
if self.git_branch not in ["staging", "production", self.args.major_version_branch]:
61+
if not ((self.git_branch in ["staging", "production", self.args.major_version_branch]) or (self.args.artifact_version or "").strip()):
5962
print("Skipped: neither on staging, production nor major version branch.")
6063
return
6164

@@ -66,9 +69,12 @@ def create_git_tag_and_release(self):
6669
self.repo.git.config("user.name", "github-actions")
6770
self.repo.git.config("user.email", "github-actions@github.com")
6871

69-
print(f"Add Git tag {self.version}")
70-
self.repo.create_tag(self.version, message=release_msg)
71-
self.repo.remotes.origin.push(self.version, force=True)
72+
if self.args.autotag or self.args.push_tag:
73+
print(f"Add Git tag {self.version}")
74+
self.repo.create_tag(self.version, message=release_msg)
75+
self.repo.remotes.origin.push(self.version, force=True)
76+
else:
77+
print("Skip add Git tag")
7278

7379
except GitCommandError as err:
7480
if "already exists" in str(err):

0 commit comments

Comments
 (0)