Skip to content

Commit cb25da1

Browse files
committed
Update exception message and corresponding test.
1 parent 2665c71 commit cb25da1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

sqlmesh/integrations/github/cicd/controller.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@ def deploy_to_prod(self) -> None:
775775
merge_status = self._get_merge_state_status()
776776
if merge_status.is_blocked:
777777
raise CICDBotError(
778-
"Merge commit cannot be cleanly created. Likely missing CODEOWNERS approval. "
778+
"Branch protection or ruleset requirement is likely not satisfied, e.g. missing CODEOWNERS approval. "
779779
"Please check PR and resolve any issues."
780780
)
781781
if merge_status.is_dirty:

tests/integrations/github/cicd/test_github_controller.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ def test_deploy_to_prod_blocked_pr(github_client, make_controller):
470470
)
471471
with pytest.raises(
472472
Exception,
473-
match=r"^Merge commit cannot be cleanly created. Likely missing CODEOWNERS approval.*",
473+
match=r"^Branch protection or ruleset requirement is likely not satisfied, e.g. missing CODEOWNERS approval.*",
474474
):
475475
controller.deploy_to_prod()
476476

0 commit comments

Comments
 (0)