From b3b6cc97bb99ff83c591edcbf0f971f57bff0cc5 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Wed, 6 Oct 2021 12:54:08 +1100
Subject: [PATCH 1/2] Configure bors for merging pull-requests

---
 README.md |  2 ++
 bors.toml | 11 +++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 bors.toml

diff --git a/README.md b/README.md
index 1268bbc..3f198bf 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Project Hermes
 
+[![Bors enabled](https://bors.tech/images/badge_small.svg)](https://app.bors.tech/repositories/38091)
+
 CFD trading on Bitcoin.
 
 Details coming soon.
diff --git a/bors.toml b/bors.toml
new file mode 100644
index 0000000..6df23eb
--- /dev/null
+++ b/bors.toml
@@ -0,0 +1,11 @@
+status = [
+  "formatting",
+  "clippy",
+  "check_frontend",
+  "build_and_test_frontend (maker)",
+  "build_and_test_frontend (taker)",
+  "test_daemons (ubuntu-latest)",
+  "test_daemons (macos-latest)",
+  "test_daemons (windows-latest)",
+  "daemons_arm_build",
+]

From 8a0695c0b657a0f792b8b5f26ec1b55e96aa4068 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Wed, 6 Oct 2021 14:03:06 +1100
Subject: [PATCH 2/2] Increase sleep time for starting up maker & taker

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4d154f7..0c474a2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -77,10 +77,10 @@ jobs:
         shell: bash
         run: |
           target/debug/maker --data-dir=/tmp/maker --generate-seed &
-          sleep 5s # Wait for maker to start
+          sleep 10s # Wait for maker to start
 
           target/debug/taker --data-dir=/tmp/taker --generate-seed &
-          sleep 5s # Wait for taker to start
+          sleep 10s # Wait for taker to start
 
           curl --fail http://localhost:8000/api/alive
           curl --fail http://localhost:8001/api/alive