Skip to content

Commit

Permalink
Merge pull request #101 from Hywan/test-ci-bors
Browse files Browse the repository at this point in the history
chore(bors) Connect Bors to Github Actions
  • Loading branch information
Hywan committed Dec 18, 2019
2 parents e733dcc + cc39803 commit 6e6f62f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 160 deletions.
157 changes: 0 additions & 157 deletions .circleci/config.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/test.yml
@@ -1,6 +1,6 @@
name: Build and Test

on: [push, pull_request]
on: [push]

jobs:
# The `test` job.
Expand All @@ -13,7 +13,7 @@ jobs:
os: [ubuntu-latest, macos-latest]
# As soon as one job fails in the matrix, all the other
# in-progress jobs are canceled.
fail-fast: false
fail-fast: true

runs-on: ${{ matrix.os }}

Expand Down
5 changes: 4 additions & 1 deletion bors.toml
@@ -1,4 +1,7 @@
status = [ "ci/circleci: build-and-test" ]
status = [
"Test (ubuntu-latest)",
"Test (macos-latest)",
]
required_approvals = 0
timeout_sec = 900
delete_merged_branches = true

0 comments on commit 6e6f62f

Please sign in to comment.