Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(bors) Set up Bors #250

Merged
merged 7 commits into from
Mar 8, 2019
Merged

feat(bors) Set up Bors #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3cfdb86
feat(bors) Set up Bors.
Hywan Mar 8, 2019
f2fe05b
Merge branch 'master' into bors
lachlansneff Mar 8, 2019
c2f9a77
Merge branch 'master' into bors
xmclark Mar 8, 2019
a08b2f2
Merge branch 'master' into bors
xmclark Mar 8, 2019
16f72e3
Just build trying and staging branches
lachlansneff Mar 8, 2019
ba66d82
Attempt to fix circleci config
lachlansneff Mar 8, 2019
ee8b573
Merge branch 'master' into bors
lachlansneff Mar 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Hywan could be possible to know why we only want to test only in staging or trying branches?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's what you're supposed to do: https://bors.tech/documentation/getting-started/

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct.


environment:
matrix:
Expand Down Expand Up @@ -57,6 +59,9 @@ before_deploy:
- appveyor PushArtifact ..\..\WasmerInstaller-%APPVEYOR_REPO_TAG_NAME%.exe
- cd ..\..\

matrix:
fast_finish: true

deploy:
description: 'WasmerInstaller'
artifact: /.*\.exe/
Expand Down
20 changes: 15 additions & 5 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions bors.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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