Skip to content

Commit b0410a0

Browse files
committed
Added fix for homebrew release flow
- Fixed not using the force release type - Added create_publish_workflow_inputs function
1 parent fa80a21 commit b0410a0

File tree

2 files changed

+30
-9
lines changed

2 files changed

+30
-9
lines changed

src/redis_release/bht/behaviours.py

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -806,18 +806,22 @@ def update(self) -> Status:
806806
pass
807807
else:
808808
assert self.release_version is not None
809-
if self.release_version.is_internal:
810-
self.package_meta.release_type = ReleaseType.INTERNAL
811-
self.package_meta.homebrew_channel = HomebrewChannel.RC
812-
else:
809+
if self.package_meta.release_type is None:
810+
if self.release_version.is_internal:
811+
self.package_meta.release_type = ReleaseType.INTERNAL
812+
else:
813+
if self.release_version.is_ga:
814+
self.package_meta.release_type = ReleaseType.PUBLIC
815+
elif self.release_version.is_rc:
816+
self.package_meta.release_type = ReleaseType.PUBLIC
817+
else:
818+
self.package_meta.release_type = ReleaseType.INTERNAL
819+
820+
if self.package_meta.homebrew_channel is None:
813821
if self.release_version.is_ga:
814-
self.package_meta.release_type = ReleaseType.PUBLIC
815822
self.package_meta.homebrew_channel = HomebrewChannel.STABLE
816-
elif self.release_version.is_rc:
817-
self.package_meta.release_type = ReleaseType.PUBLIC
818-
self.package_meta.homebrew_channel = HomebrewChannel.RC
819823
else:
820-
self.package_meta.release_type = ReleaseType.INTERNAL
824+
# RC, internal, or any other version goes to RC channel
821825
self.package_meta.homebrew_channel = HomebrewChannel.RC
822826
self.feedback_message = f"release_type: {self.package_meta.release_type.value}, homebrew_channel: {self.package_meta.homebrew_channel.value}"
823827

src/redis_release/bht/tree_factory.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,23 @@ def create_build_workflow_inputs(
529529
release_meta,
530530
log_prefix=log_prefix,
531531
)
532+
def create_publish_workflow_inputs(
533+
self,
534+
name: str,
535+
workflow: Workflow,
536+
package_meta: PackageMeta,
537+
release_meta: ReleaseMeta,
538+
log_prefix: str,
539+
) -> Behaviour:
540+
541+
return HomewbrewWorkflowInputs(
542+
name,
543+
workflow,
544+
cast(HomebrewMeta, package_meta),
545+
release_meta,
546+
log_prefix=log_prefix,
547+
)
548+
532549

533550

534551
# Factory registry

0 commit comments

Comments
 (0)