about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLaurențiu Nicola <lnicola@dend.ro>2023-10-05 15:03:44 +0300
committerLaurențiu Nicola <lnicola@dend.ro>2023-10-05 15:26:09 +0300
commite7295ff40cc507627e763425e78003dc7ac977e5 (patch)
tree86a6ef1634f290e2b5b879150fb8437a1d2f9cc7
parentb57658d9a9fbc3ca34c1eb13ef41ef0e5e4b49d0 (diff)
downloadrust-e7295ff40cc507627e763425e78003dc7ac977e5.tar.gz
rust-e7295ff40cc507627e763425e78003dc7ac977e5.zip
Prepare for rust-bors
-rw-r--r--.github/workflows/ci.yaml1
-rw-r--r--rust-bors.toml1
2 files changed, 2 insertions, 0 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 6dc339eddf3..1f2a7796d11 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -8,6 +8,7 @@ on:
     branches:
       - auto
       - try
+      - automation/bors/try
 
 env:
   CARGO_INCREMENTAL: 0
diff --git a/rust-bors.toml b/rust-bors.toml
new file mode 100644
index 00000000000..c31ba66c50f
--- /dev/null
+++ b/rust-bors.toml
@@ -0,0 +1 @@
+timeout = 3600