Skip to content

Commit

Permalink
Merge pull request #145 from NixOS/update_flake_lock_action
Browse files Browse the repository at this point in the history
flake.lock: Update
  • Loading branch information
Mic92 authored Feb 2, 2025
2 parents bd48eed + ab7807d commit 0d49437
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 39 deletions.
13 changes: 0 additions & 13 deletions .mergify.yml

This file was deleted.

36 changes: 18 additions & 18 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions nixpkgs_merge_bot/commands/merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ def process_pull_request_status(

def merge_command(issue_comment: IssueComment, settings: Settings) -> HttpResponse:
log.debug(
f"{issue_comment.issue_number }: We have been called with the merge command"
f"{issue_comment.issue_number}: We have been called with the merge command"
)
log.debug(f"{issue_comment.issue_number }: Getting GitHub client")
log.debug(f"{issue_comment.issue_number}: Getting GitHub client")
client = get_github_client(settings)
pull_request = PullRequest.from_json(
client.pull_request(
Expand All @@ -86,13 +86,13 @@ def merge_command(issue_comment: IssueComment, settings: Settings) -> HttpRespon
)
# Setup for this comment is done we ensured that this is address to us and we have a command

log.info(f"{issue_comment.issue_number }: Checking mergeability")
log.info(f"{issue_comment.issue_number}: Checking mergeability")
merge_strategies = [
MaintainerUpdate(client, settings),
CommitterPR(client, settings),
]
log.info(
f"{issue_comment.issue_number }: {len(merge_strategies)} merge strategies configured"
f"{issue_comment.issue_number}: {len(merge_strategies)} merge strategies configured"
)

one_merge_strategy_passed = False
Expand All @@ -114,7 +114,7 @@ def merge_command(issue_comment: IssueComment, settings: Settings) -> HttpRespon

if one_merge_strategy_passed:
log.info(
f"{issue_comment.issue_number }: A merge strategy passed we will notify the user with a rocket emoji"
f"{issue_comment.issue_number}: A merge strategy passed we will notify the user with a rocket emoji"
)
client.create_issue_reaction(
issue_comment.repo_owner,
Expand Down Expand Up @@ -147,7 +147,7 @@ def merge_command(issue_comment: IssueComment, settings: Settings) -> HttpRespon
issue_comment.commenter_login
).json()
log.info(
f"{issue_comment.issue_number }: Trying to merge pull request, with head_sha: {pull_request.head_sha}"
f"{issue_comment.issue_number}: Trying to merge pull request, with head_sha: {pull_request.head_sha}"
)
client.merge_pull_request(
issue_comment.repo_owner,
Expand All @@ -159,7 +159,7 @@ def merge_command(issue_comment: IssueComment, settings: Settings) -> HttpRespon
merge_tracker_link = (
"Merge completed (#306934)" # Link Issue to track merges
)
log.info(f"{issue_comment.issue_number }: {merge_tracker_link}")
log.info(f"{issue_comment.issue_number}: {merge_tracker_link}")
client.create_issue_comment(
issue_comment.repo_owner,
issue_comment.repo_name,
Expand Down Expand Up @@ -189,7 +189,7 @@ def merge_command(issue_comment: IssueComment, settings: Settings) -> HttpRespon
return issue_response("merge-failed")
elif check_suite_result.failed:
log.info(
f"{issue_comment.issue_number }: OfBorg failed, we let the user know"
f"{issue_comment.issue_number}: OfBorg failed, we let the user know"
)
msg = f"@{issue_comment.commenter_login} merge not possible, check suite failed: \n"
decline_reasons = list(set(decline_reasons))
Expand Down

0 comments on commit 0d49437

Please sign in to comment.