From 3cfdb868ef523376e057cb595b464ab606b5ef43 Mon Sep 17 00:00:00 2001
From: Ivan Enderlin <ivan.enderlin@hoa-project.net>
Date: Fri, 8 Mar 2019 10:20:46 +0100
Subject: [PATCH 1/3] feat(bors) Set up Bors.

---
 .appveyor.yml | 9 +++++++--
 bors.toml     | 9 +++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 bors.toml

diff --git a/.appveyor.yml b/.appveyor.yml
index eca2e24aedf..40194cd066c 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -2,8 +2,10 @@ version: "{build} ~ {branch}"
 
 os: Visual Studio 2017
 
-# Do not build feature branch with open Pull Requests
-skip_branch_with_pr: true
+branches:
+  only:
+    - staging
+    - trying
 
 environment:
   matrix:
@@ -57,6 +59,9 @@ after_build:
   - appveyor PushArtifact ..\..\WasmerInstaller-%APPVEYOR_REPO_TAG_NAME%.exe
   - cd ..\..\
 
+matrix:
+  fast_finish: true
+
 deploy:
   description: 'WasmerInstaller'
   artifact: /.*\.exe/
diff --git a/bors.toml b/bors.toml
new file mode 100644
index 00000000000..c56141cd5ff
--- /dev/null
+++ b/bors.toml
@@ -0,0 +1,9 @@
+status = [
+    "ci/circleci: lint",
+    "ci/circleci: test",
+    "ci/circleci: test-macos",
+    "continuous-integration/appveyor/branch"
+]
+required_approvals = 1
+timeout_sec = 900
+delete_merged_branches = true 
\ No newline at end of file

From 16f72e30f4851040f8e3b3e81324a9767b50a94b Mon Sep 17 00:00:00 2001
From: Lachlan Sneff <lachlan.sneff@gmail.com>
Date: Fri, 8 Mar 2019 15:06:39 -0800
Subject: [PATCH 2/3] Just build trying and staging branches

---
 .circleci/config.yml | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c5ea7e21998..aca9afd1c72 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -310,25 +310,30 @@ workflows:
     jobs:
       - lint
       - test:
-          filters:
-            branches:
-              ignore: master
+          branches:
+            only:
+              - trying
+              - staging
       - test-macos:
-          filters:
-            branches:
-              ignore: master
+          branches:
+            only:
+              - trying
+              - staging
       - test-and-build:
-          filters:
-            branches:
-              only: master
+          branches:
+            only:
+              - trying
+              - staging
       - test-and-build-macos:
-          filters:
-            branches:
-              only: master
+          branches:
+            only:
+              - trying
+              - staging
       - test-rust-nightly:
-          filters:
-            branches:
-              only: master
+          branches:
+            only:
+              - trying
+              - staging
       - publish-github-release:
           requires:
             - lint

From ba66d82b72be9266e386093ed63aae508c4f8c15 Mon Sep 17 00:00:00 2001
From: Lachlan Sneff <lachlan.sneff@gmail.com>
Date: Fri, 8 Mar 2019 15:08:28 -0800
Subject: [PATCH 3/3] Attempt to fix circleci config

---
 .circleci/config.yml | 45 ++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index aca9afd1c72..1ca2ddcb157 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -310,30 +310,35 @@ workflows:
     jobs:
       - lint
       - test:
-          branches:
-            only:
-              - trying
-              - staging
+          filters:
+            branches:
+              only:
+                - trying
+                - staging
       - test-macos:
-          branches:
-            only:
-              - trying
-              - staging
+          filters:
+            branches:
+              only:
+                - trying
+                - staging
       - test-and-build:
-          branches:
-            only:
-              - trying
-              - staging
+          filters:
+            branches:
+              only:
+                - trying
+                - staging
       - test-and-build-macos:
-          branches:
-            only:
-              - trying
-              - staging
+          filters:
+            branches:
+              only:
+                - trying
+                - staging
       - test-rust-nightly:
-          branches:
-            only:
-              - trying
-              - staging
+          filters:
+            branches:
+              only:
+                - trying
+                - staging
       - publish-github-release:
           requires:
             - lint