diff --git a/.appveyor.yml b/.appveyor.yml index 0c612592a20..56df0ef214d 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 @@ 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 index c5ea7e21998..1ca2ddcb157 100644 --- 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 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