From 51fbaefe415abd35305b798fc3772afeccceddf4 Mon Sep 17 00:00:00 2001
From: Adam Szkoda <adaszko@gmail.com>
Date: Tue, 7 Jul 2020 06:31:20 +0000
Subject: [PATCH] Add bors configuration (#1340)

Melded together stuff from https://github.com/sigp/lighthouse/pull/1326 and https://github.com/sigp/lighthouse/pull/1337.

Note that I've reduced the timeout to 2 hours to save some time in case the build gets stuck.

Co-authored-by: Michael Sproul <michael@sigmaprime.io>
---
 .github/workflows/test-suite.yml | 46 +++++++++++++++++---------------
 bors.toml                        |  3 +++
 2 files changed, 27 insertions(+), 22 deletions(-)
 create mode 100644 bors.toml

diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
index 34554afaa..8ddabb3b3 100644
--- a/.github/workflows/test-suite.yml
+++ b/.github/workflows/test-suite.yml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - master
+      - staging
+      - trying
   pull_request:
 
 jobs:
@@ -108,27 +110,27 @@ jobs:
     - name: Lint code for quality and style with Clippy
       run: make lint
   arbitrary-check:
-   runs-on: ubuntu-latest
-   needs: cargo-fmt
-   steps:
-   - uses: actions/checkout@v1
-   - name: Validate state_processing feature arbitrary-fuzz
-     run:  make arbitrary-fuzz
+    runs-on: ubuntu-latest
+    needs: cargo-fmt
+    steps:
+    - uses: actions/checkout@v1
+    - name: Validate state_processing feature arbitrary-fuzz
+      run:  make arbitrary-fuzz
   cargo-audit:
-   runs-on: ubuntu-latest
-   needs: cargo-fmt
-   steps:
-   - uses: actions/checkout@v1
-   - name: Run cargo audit to identify known security vulnerabilities reported to the RustSec Advisory Database
-     run:  make audit
+    runs-on: ubuntu-latest
+    needs: cargo-fmt
+    steps:
+    - uses: actions/checkout@v1
+    - name: Run cargo audit to identify known security vulnerabilities reported to the RustSec Advisory Database
+      run:  make audit
   cargo-udeps:
-   runs-on: ubuntu-latest
-   needs: cargo-fmt
-   steps:
-   - uses: actions/checkout@v1
-   - name: Get latest version of nightly Rust
-     run: rustup update nightly
-   - name: Install cargo-udeps
-     run: cargo install cargo-udeps --locked
-   - name: Run cargo udeps to identify unused crates in the dependency graph
-     run: make udeps
+    runs-on: ubuntu-latest
+    needs: cargo-fmt
+    steps:
+    - uses: actions/checkout@v1
+    - name: Get latest version of nightly Rust
+      run: rustup update nightly
+    - name: Install cargo-udeps
+      run: cargo install cargo-udeps --locked
+    - name: Run cargo udeps to identify unused crates in the dependency graph
+      run: make udeps
diff --git a/bors.toml b/bors.toml
new file mode 100644
index 000000000..4626b9069
--- /dev/null
+++ b/bors.toml
@@ -0,0 +1,3 @@
+status = ["%"]
+use_squash_merge = true
+timeout_sec = 7200