From 9f19b109141b8ee920d5eb81c613cd409a90121a Mon Sep 17 00:00:00 2001 From: Nick Mosher Date: Mon, 21 Jun 2021 08:08:13 -0400 Subject: [PATCH] Add bors config --- .github/workflows/ci.yml | 23 ++++++++++++++++------- bors.toml | 6 ++++++ 2 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 bors.toml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e0089a7..2f34e65 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,14 +2,15 @@ name: CI on: push: - branches: [main] + branches: + - staging + - trying pull_request: - branches: [main] workflow_dispatch: jobs: - - check_clippy: + clippy: + name: Clippy runs-on: ${{ matrix.os }} strategy: matrix: @@ -24,8 +25,9 @@ jobs: override: true - name: check clippy run: make check-clippy RUSTV=${{ matrix.rust }} - check_fmt: - name: check cargo fmt + + rustfmt: + name: Rustfmt runs-on: ${{ matrix.os }} strategy: matrix: @@ -56,4 +58,11 @@ jobs: toolchain: ${{ matrix.rust }} override: true - name: Run unit tests - run: make test-all \ No newline at end of file + run: make test-all + + done: + name: "Done!" + needs: [clippy, rustfmt, unit_test] + runs-on: ubuntu-latest + steps: + - run: echo "Done!" \ No newline at end of file diff --git a/bors.toml b/bors.toml new file mode 100644 index 0000000..08b5685 --- /dev/null +++ b/bors.toml @@ -0,0 +1,6 @@ +status = [ + "Done", +] +use_squash_merge = true +delete_merged_branches = true +timeout_sec = 1800 # 30 mins