Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove dry-run options #46

Merged
merged 1 commit into from
Feb 23, 2024
Merged

Remove dry-run options #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions nixpkgs_merge_bot/commands/merge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,6 @@ def merge_command(issue: Issue, settings: Settings) -> HttpResponse:
)
check_suite_result = process_pull_request_status(client, pull_request)
decline_reasons.extend(check_suite_result.messages)
if check_suite_result.success:
check_suite_result.success = False
decline_reasons.append("Dry run bot")
log.info(f"{issue.issue_number }: dry running aborting here")
if check_suite_result.pending:
db = Database(settings)
db.add(pull_request.head_sha, str(issue.issue_number))
Expand Down
2 changes: 1 addition & 1 deletion tests/test_webhook.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def test_post_merge(webhook_client: WebhookClient, mocker: MockerFixture) -> Non
response = client.getresponse()
response_body = json.loads(response.read().decode("utf-8"))
assert response.status == 200, f"Response: {response.status}, {response_body}"
assert response_body["action"] == "not-permitted" # merges are disabled for now
assert response_body["action"] == "merged" # merges are disabled for now


@pytest.mark.parametrize(
Expand Down