Merge #63

bors[bot] · ltratt · web-flow · commit 8129dba645f9 · 2020-05-29T20:46:42.000Z
63: Add bors/buildbot support. r=ptersilie a=ltratt



Co-authored-by: Laurence Tratt &lt;laurie@tratt.net&gt;
diff --git a/.buildbot.sh b/.buildbot.sh
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+set -e
+
+make
diff --git a/.travis.yml b/.travis.yml
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@
 all: clean check
 
 check:
-	python3.5 ./bin/prebib softdev.bib > out.bib
+	python3 ./bin/prebib softdev.bib > out.bib
 	pdflatex check
 	bibtex check
 	pdflatex check
diff --git a/bors.toml b/bors.toml
@@ -0,0 +1,6 @@
+status = ["buildbot/buildbot-build-script"]
+
+timeout_sec = 300 # 5 minutes
+
+# Have bors delete auto-merged branches
+delete_merged_branches = true

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +#! /bin/sh
++
 +set -e
++
 +make