Merge pull request #128 from NixOS/remove-ofborg

no longer wait for ofborg
NixOS · Dec 1, 2024 · 03d3e42 · 03d3e42
2 parents c0cdb51 + b2e8cf0
commit 03d3e42
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 216 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -7,7 +7,8 @@
     flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
 
     # used for development
-    treefmt-nix.url = "github:numtide/treefmt-nix";
+    # https://github.com/numtide/treefmt-nix/pull/269
+    treefmt-nix.url = "github:numtide/treefmt-nix/mypy";
     treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
 
     sops-nix.url = "github:Mic92/sops-nix";

diff --git a/nix/treefmt/flake-module.nix b/nix/treefmt/flake-module.nix
@@ -3,27 +3,26 @@
   imports = [
     inputs.treefmt-nix.flakeModule
   ];
-  perSystem =
-    { pkgs, ... }:
-    {
-      treefmt = {
-        projectRootFile = ".git/config";
-        programs.nixfmt.enable = true;
-        programs.shellcheck.enable = true;
-        programs.deno.enable = true;
-        settings.formatter.deno.excludes = [
-          "tests/data/*.json"
-          "secrets.yaml"
-        ];
-        settings.formatter.shellcheck.options = [
-          "-s"
-          "bash"
-        ];
+  perSystem = {
+    treefmt = {
+      projectRootFile = ".git/config";
+      programs.nixfmt.enable = true;
+      programs.shellcheck.enable = true;
+      programs.deno.enable = true;
 
-        programs.mypy.enable = true;
-        programs.mypy.directories."." = { };
-        programs.ruff.check = true;
-        programs.ruff.format = true;
-      };
+      settings.global.excludes = [
+        "tests/data/*.json"
+        "secrets.yaml"
+      ];
+      settings.formatter.shellcheck.options = [
+        "-s"
+        "bash"
+      ];
+
+      programs.mypy.enable = true;
+      programs.mypy.directories."." = { };
+      programs.ruff.check = true;
+      programs.ruff.format = true;
     };
+  };
 }
diff --git a/nixpkgs_merge_bot/commands/merge.py b/nixpkgs_merge_bot/commands/merge.py
@@ -26,64 +26,42 @@ def process_pull_request_status(
 ) -> CheckRunResult:
     check_run_result = CheckRunResult(True, False, False, [])
 
-    # As ofBorg takes a while to add a check_suite to the pull request we have to check the statues first if this is still pending
-
-    statuses = client.get_statuses_for_commit(
+    log.debug(f"{pull_request.number}: Getting check suites for commit")
+    check_runs_for_commit = client.get_check_runs_for_commit(
         pull_request.repo_owner, pull_request.repo_name, pull_request.head_sha
-    ).json()
-    if statuses["state"] != "success":
-        check_run_result.success = False
-        log.info(f"{pull_request.number}: Status {statuses['state']} is not success")
-    if statuses["state"] == "pending":
-        check_run_result.success = False
-        check_run_result.pending = True
-        message = "Some status is still pending"
-        log.info(f"{pull_request.number}: {message}")
-        check_run_result.messages.append(message)
-    if check_run_result.success:
+    )
+    for check_run in check_runs_for_commit.json()["check_runs"]:
         log.debug(
-            f"{pull_request.number} All the statues where fine we now move to check the check_suites"
+            f"{pull_request.number}: {check_run['name']} conclusion: {check_run['conclusion']} and status: {check_run['status']}"
         )
-        log.debug(f"{pull_request.number}: Getting check suites for commit")
-        check_runs_for_commit = client.get_check_runs_for_commit(
-            pull_request.repo_owner, pull_request.repo_name, pull_request.head_sha
-        )
-        for check_run in check_runs_for_commit.json()["check_runs"]:
-            log.debug(
-                f"{pull_request.number}: {check_run['name']} conclusion: {check_run['conclusion']} and status: {check_run['status']}"
-            )
-            # Ignoring darwin checks for ofborg as these get stucked quite often
-            if "darwin" in check_run["name"] and (
-                check_run["status"] == "queued" or check_run["status"] == "neutral"
+        # Ignoring darwin checks for ofborg as these get stucked quite often
+        if "darwin" in check_run["name"] and (
+            check_run["status"] == "queued" or check_run["status"] == "neutral"
+        ):
+            log.debug(f"{pull_request.number}: Ignoring darwin check")
+            continue
+
+        if check_run["status"] != "completed":
+            message = f"Check run {check_run['name']} is not completed, we will wait for it to finish and if it succeeds we will merge this."
+            check_run_result.messages.append(message)
+            log.info(f"{pull_request.number}: {message}")
+            check_run_result.success = False
+            if check_run["status"] == "in_progress" or check_run["status"] == "queued":
+                log.debug(f"{pull_request.number}: Check run is in progress or queued")
+                check_run_result.pending = True
+        else:
+            # if the state is not success or skipped we will decline the merge. The state can be
+            # Can be one of: success, failure, neutral, cancelled, timed_out, action_required, stale, null, skipped, startup_failure
+            if not (
+                check_run["conclusion"] == "success"
+                or check_run["conclusion"] == "skipped"
+                or check_run["conclusion"] == "neutral"
             ):
-                log.debug(f"{pull_request.number}: Ignoring darwin check")
-                continue
-            if check_run["status"] != "completed":
-                message = f"Check run {check_run['name']} is not completed, we will wait for it to finish and if it succeeds we will merge this."
-                check_run_result.messages.append(message)
-                log.info(f"{pull_request.number}: {message}")
                 check_run_result.success = False
-                if (
-                    check_run["status"] == "in_progress"
-                    or check_run["status"] == "queued"
-                ):
-                    log.debug(
-                        f"{pull_request.number}: Check run is in progress or queued"
-                    )
-                    check_run_result.pending = True
-            else:
-                # if the state is not success or skipped we will decline the merge. The state can be
-                # Can be one of: success, failure, neutral, cancelled, timed_out, action_required, stale, null, skipped, startup_failure
-                if not (
-                    check_run["conclusion"] == "success"
-                    or check_run["conclusion"] == "skipped"
-                    or check_run["conclusion"] == "neutral"
-                ):
-                    check_run_result.success = False
-                    check_run_result.failed = True
-                    message = f"Check suite {check_run['app']['name']} is {check_run['conclusion']}"
-                    check_run_result.messages.append(message)
-                    log.info(f"{pull_request.number}: message")
+                check_run_result.failed = True
+                message = f"Check suite {check_run['app']['name']} is {check_run['conclusion']}"
+                check_run_result.messages.append(message)
+                log.info(f"{pull_request.number}: message")
     return check_run_result
 
 

diff --git a/tests/data/get_statuses_for_commit.json b/tests/data/get_statuses_for_commit.json
diff --git a/tests/test_webhook.py b/tests/test_webhook.py
@@ -91,9 +91,6 @@ def default_mocks(mocker: MockerFixture) -> dict[str, Any]:
         "nixpkgs_merge_bot.github.GitHubClient.GithubClient.get_check_runs_for_commit": FakeHttpResponse(
             TEST_DATA / "get_check_run_for_commit.json"
         ),
-        "nixpkgs_merge_bot.github.GitHubClient.GithubClient.get_statuses_for_commit": FakeHttpResponse(
-            TEST_DATA / "get_statuses_for_commit.json"
-        ),
         "nixpkgs_merge_bot.github.GitHubClient.GithubClient.create_issue_comment": FakeHttpResponse(
             TEST_DATA / "issue_comment.merge.json"
         ),  # unused