From 56135e103395908a0d099d30b0aa8eab5b436a1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Orhun=20Parmaks=C4=B1z?= Date: Mon, 28 Feb 2022 17:49:00 +0300 Subject: [PATCH] chore(project): integrate bors --- .dockerignore | 3 ++- .github/workflows/ci.yml | 6 +++--- bors.toml | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 bors.toml diff --git a/.dockerignore b/.dockerignore index a026918..30981a7 100644 --- a/.dockerignore +++ b/.dockerignore @@ -12,4 +12,5 @@ Dockerfile LICENSE* rustfmt.toml -deny.toml \ No newline at end of file +deny.toml +bors.toml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f1b4d26..730b13d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,12 +1,12 @@ name: Continuous Integration on: + pull_request: push: branches: - main - pull_request: - branches: - - main + - staging # for bors + - trying # for bors schedule: - cron: "0 0 * * 0" diff --git a/bors.toml b/bors.toml new file mode 100644 index 0000000..0ea2447 --- /dev/null +++ b/bors.toml @@ -0,0 +1,14 @@ +status = [ + "Build %", + "Test", + "Lint", + "Audit" +] +required_approvals = 1 +up_to_date_approvals = true +delete_merged_branches = true +update_base_for_deletes = true +use_codeowners = true +use_squash_merge = true +commit_title = "Merge ${PR_REFS}" +timeout_sec = 36000