about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-07-05 13:51:36 +0000
committerbors <bors@rust-lang.org>2022-07-05 13:51:36 +0000
commitfee5555cfabed4b8abbd40983fc4442df4007e49 (patch)
treeaef0dd4ad4ea1f4ba9efaa00f0ed53407c060822
parent6edf624cbe75cb77723d9f62f1f6ba4a5fa8fc74 (diff)
parent0d9737ac1cbd88629975cd0d905d12b6c9aeff3b (diff)
downloadrust-fee5555cfabed4b8abbd40983fc4442df4007e49.tar.gz
rust-fee5555cfabed4b8abbd40983fc4442df4007e49.zip
Auto merge of #12694 - hi-rustin:rustin-patch-bors, r=jonas-schievink
Remove useless bors.toml

It seems we do not use bors-ng anymore. So maybe this is useless.
-rw-r--r--bors.toml9
-rw-r--r--crates/sourcegen/src/lib.rs2
2 files changed, 1 insertions, 10 deletions
diff --git a/bors.toml b/bors.toml
deleted file mode 100644
index 1f660303032..00000000000
--- a/bors.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-status = [
-    "Rust (ubuntu-latest)",
-    "Rust (windows-latest)",
-    "Rust (macos-latest)",
-    "TypeScript (ubuntu-latest)",
-    "TypeScript (windows-latest)",
-]
-delete_merged_branches = true
-timeout_sec = 1200 # 20 min
diff --git a/crates/sourcegen/src/lib.rs b/crates/sourcegen/src/lib.rs
index 719b35b6303..d991846c7f6 100644
--- a/crates/sourcegen/src/lib.rs
+++ b/crates/sourcegen/src/lib.rs
@@ -196,6 +196,6 @@ fn normalize_newlines(s: &str) -> String {
 pub fn project_root() -> PathBuf {
     let dir = env!("CARGO_MANIFEST_DIR");
     let res = PathBuf::from(dir).parent().unwrap().parent().unwrap().to_owned();
-    assert!(res.join("bors.toml").exists());
+    assert!(res.join("triagebot.toml").exists());
     res
 }