From fe0ccf28c9583e4469ceefe193be889e56ddac88 Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Tue, 15 Nov 2022 10:52:34 +0100
Subject: [PATCH 1/4] CI: add bors.toml

---
 bors.toml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 bors.toml

diff --git a/bors.toml b/bors.toml
new file mode 100644
index 0000000000..7e7a19e4e9
--- /dev/null
+++ b/bors.toml
@@ -0,0 +1,28 @@
+# List of commit statuses that must pass on the PR commit when it is r+-ed.
+# (listed in same order as in the repo's branch protection settings)
+pr_status = [
+ "python-tests",
+ "tools-build",
+ "check-labels",
+ "static-tests",
+ "check-commits (commit-msg)",
+ "check-commits (pr-check)",
+ "Murdock",
+ ]
+
+# List of commit statuses that must pass on the merge commit before it is
+# pushed to master.
+status = [
+  "Murdock",
+  "static-tests",
+  "tools-build",
+  ]
+
+# Number of project members who must approve the PR (using GitHub Reviews)
+# before it is pushed to master.
+# This necessary even with the check-labels action (which checks for >1 ACKs),
+# as that passes when there's no review or no special label set.
+required_approvals = 1
+
+# delete branch after successful merge
+delete_merged_branches = true

From 7c9c06d977048575e4d9b38b886e57f242527835 Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Tue, 15 Nov 2022 13:05:35 +0100
Subject: [PATCH 2/4] .github/labeler.yml: add bors.toml to CI list

---
 .github/labeler.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 22c02b7b54..52ea3f4838 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -20,6 +20,7 @@
   - ".github/**/*.yml"
   - ".murdock"
   - ".murdock.yml"
+  - "bors.toml"
 
 "Area: CoAP":
   - "sys/net/application_layer/*coap/**/*"

From a32ebac535cfea5db8a2128e4e9d95e349089c04 Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Tue, 22 Nov 2022 12:49:14 +0100
Subject: [PATCH 3/4] CI: make static-tests and tools-build workflows run on
 bors branches

---
 .github/workflows/static-test.yml     | 2 ++
 .github/workflows/tools-buildtest.yml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.github/workflows/static-test.yml b/.github/workflows/static-test.yml
index 8d80d3a781..81b2a51786 100644
--- a/.github/workflows/static-test.yml
+++ b/.github/workflows/static-test.yml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - master
+      - staging
+      - trying
     tags:
       - '[0-9][0-9][0-9][0-9].[0-9][0-9]-RC[0-9]*'
       - '[0-9][0-9][0-9][0-9].[0-9][0-9]'
diff --git a/.github/workflows/tools-buildtest.yml b/.github/workflows/tools-buildtest.yml
index 3934f51727..32096030d9 100644
--- a/.github/workflows/tools-buildtest.yml
+++ b/.github/workflows/tools-buildtest.yml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - master
+      - staging
+      - trying
     tags:
       - '*'
   pull_request:

From 4fb5978fa9c18d3b4c36a5e11ec49a8ea079f870 Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Mon, 28 Nov 2022 14:26:33 +0100
Subject: [PATCH 4/4] CI: set higher bors timeout

---
 bors.toml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/bors.toml b/bors.toml
index 7e7a19e4e9..2c92b093c1 100644
--- a/bors.toml
+++ b/bors.toml
@@ -6,7 +6,7 @@ pr_status = [
  "check-labels",
  "static-tests",
  "check-commits (commit-msg)",
- "check-commits (pr-check)",
+ "check-commits (pr_check)",
  "Murdock",
  ]
 
@@ -26,3 +26,10 @@ required_approvals = 1
 
 # delete branch after successful merge
 delete_merged_branches = true
+
+# timeout for bors-initiated builds.
+# unfortunately bors is not the only entity queuing builds, so this needs
+# to take a full nightly build *plus* another full bors build *plus* some
+# possible intermediate PR builds into accound.
+# let's try ten hours (36000s)
+timeout_sec = 36000