From a02aa5d34406723ee23ae1bb2eb79ab7513f1c97 Mon Sep 17 00:00:00 2001 From: ChrisRBe <31167512+ChrisRBe@users.noreply.github.com> Date: Mon, 6 Sep 2021 19:27:26 +0200 Subject: [PATCH 1/4] Create bors.toml --- bors.toml | 1 + 1 file changed, 1 insertion(+) create mode 100644 bors.toml diff --git a/bors.toml b/bors.toml new file mode 100644 index 0000000..0b90535 --- /dev/null +++ b/bors.toml @@ -0,0 +1 @@ +status = ["ci"] From 1327f28c52a1ab1744af1c21883a2b80c3457182 Mon Sep 17 00:00:00 2001 From: ChrisRBe <31167512+ChrisRBe@users.noreply.github.com> Date: Mon, 6 Sep 2021 19:30:53 +0200 Subject: [PATCH 2/4] Update bors.toml --- bors.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bors.toml b/bors.toml index 0b90535..07f7230 100644 --- a/bors.toml +++ b/bors.toml @@ -1 +1 @@ -status = ["ci"] +status = ["build"] From d9521069742fb315171e399d7be9e41c0f63d3c0 Mon Sep 17 00:00:00 2001 From: ChrisRBe <31167512+ChrisRBe@users.noreply.github.com> Date: Mon, 6 Sep 2021 19:32:28 +0200 Subject: [PATCH 3/4] Update integration.yml --- .github/workflows/integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index f2006da..c42445b 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -5,7 +5,7 @@ name: Integration on: push: - branches: [ master ] + branches: [ master, staging, trying ] pull_request: branches: [ master ] From 9625226862d92302662d6cdd9068672d4781f017 Mon Sep 17 00:00:00 2001 From: ChrisRBe <31167512+ChrisRBe@users.noreply.github.com> Date: Mon, 6 Sep 2021 21:58:32 +0200 Subject: [PATCH 4/4] Update bors.toml --- bors.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bors.toml b/bors.toml index 07f7230..3a404c8 100644 --- a/bors.toml +++ b/bors.toml @@ -1 +1,3 @@ status = ["build"] +delete_merged_branches = true +required_approvals = 0