From be12f80cfa54b4021138e9470c8c177c975a67c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 2 Jan 2023 11:49:45 +0100 Subject: [PATCH 1/2] bors: include garnix in tests --- bors.toml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/bors.toml b/bors.toml index c9665f9..826bb37 100644 --- a/bors.toml +++ b/bors.toml @@ -1,2 +1,12 @@ cut_body_after = "" # don't include text from the PR body in the merge commit message -status = ["tests (ubuntu-latest)", "tests (macos-latest)"] +status = [ + # garnix + "Evaluate flake.nix", + "package nix-eval-jobs [x86_64-linux]", + "devShell default [x86_64-linux]", + "check treefmt [x86_64-linux]", + "package default [x86_64-linux]", + # github actions + "tests (ubuntu-latest)", + "tests (macos-latest)" +] From a42845708ebaca35d1770b0f906f0e7df884316e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 2 Jan 2023 11:51:28 +0100 Subject: [PATCH 2/2] add mergify rules for garnix --- .mergify.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index b50b3b3..ea18fb2 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,9 +1,11 @@ pull_request_rules: - name: automatic merge on CI success conditions: - - check-success=flake-checks - - check-success=builds (treefmt, ubuntu-latest) - - check-success=builds (treefmt, macos-latest) + - check-success=Evaluate flake.nix + - check-success=package nix-eval-jobs [x86_64-linux] + - check-success=devShell default [x86_64-linux] + - check-success=check treefmt [x86_64-linux] + - check-success=package default [x86_64-linux] - check-success=tests (ubuntu-latest) - check-success=tests (macos-latest) - author=nix-eval-jobs-bot