aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jorge Aparicio <jorge@japaric.io> 2018-02-24 22:28:34 +0100
committerGravatar Jorge Aparicio <jorge@japaric.io> 2018-02-24 22:28:34 +0100
commit2fd6d96ae5c3bdf8dfcbdcf8137d80dbfc9433c6 (patch)
treedc988938e25b08f1105124175a79a244dd674e15
parentef9ac4f63c3ca5637a93a2cad2e3f53a7fe614c2 (diff)
downloadcortex-m-2fd6d96ae5c3bdf8dfcbdcf8137d80dbfc9433c6.tar.gz
cortex-m-2fd6d96ae5c3bdf8dfcbdcf8137d80dbfc9433c6.tar.zst
cortex-m-2fd6d96ae5c3bdf8dfcbdcf8137d80dbfc9433c6.zip
bors-ng integration
-rw-r--r--.travis.yml5
-rw-r--r--bors.toml4
2 files changed, 6 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 5c47bd4..fbdc1dc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,9 +33,8 @@ before_cache:
branches:
only:
- - auto
- - master
- - try
+ - staging
+ - trying
notifications:
email:
diff --git a/bors.toml b/bors.toml
new file mode 100644
index 0000000..cf4fc21
--- /dev/null
+++ b/bors.toml
@@ -0,0 +1,4 @@
+status = [
+ "continuous-integration/travis-ci/push",
+ "continuous-integration/appveyor/branch"
+] \ No newline at end of file