Merge #250

250: feat(bors) Set up Bors r=lachlansneff a=Hywan I'm trying to setup Bors. I think we may update some settings on the Github repo. See https://bors.tech/documentation/getting-started/ for the documentation. Co-authored-by: Ivan Enderlin <[email protected]> Co-authored-by: Lachlan Sneff <[email protected]> Co-authored-by: Mackenzie Clark <[email protected]>
wasmerio · Mar 8, 2019 · a61fdf8 · a61fdf8
2 parents 17eada5 + ee8b573
commit a61fdf8
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 7 deletions.
diff --git 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 @@ before_deploy:
   - appveyor PushArtifact ..\..\WasmerInstaller-%APPVEYOR_REPO_TAG_NAME%.exe
   - cd ..\..\
 
+matrix:
+  fast_finish: true
+
 deploy:
   description: 'WasmerInstaller'
   artifact: /.*\.exe/

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -312,23 +312,33 @@ workflows:
       - test:
           filters:
             branches:
-              ignore: master
+              only:
+                - trying
+                - staging
       - test-macos:
           filters:
             branches:
-              ignore: master
+              only:
+                - trying
+                - staging
       - test-and-build:
           filters:
             branches:
-              only: master
+              only:
+                - trying
+                - staging
       - test-and-build-macos:
           filters:
             branches:
-              only: master
+              only:
+                - trying
+                - staging
       - test-rust-nightly:
           filters:
             branches:
-              only: master
+              only:
+                - trying
+                - staging
       - publish-github-release:
           requires:
             - lint

diff --git a/bors.toml 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