Merge #241 241: Configure Bors to use GitHub Actions rather than Travis checks. r=hudson-ayers a=jrvanwhy The GitHub Actions workflows work better than Travis, and are a superset of the Travis checks. Travis is currently broken and I'd rather replace it with Actions than fix it. This PR should make Bors listen to GitHub actions rather than Travis. If this works, then I'll remove the Travis config entirely in a future PR. Co-authored-by: Johnathan Van Why <jrvanwhy@google.com>
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 744ea69..ad0738e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml
@@ -1,7 +1,15 @@ # This workflow provides automated testing. It builds and runs tests on each PR. name: ci -on: pull_request + +# We want to run CI on all pull requests. Additionally, Bors needs workflows to +# run on the `staging` and `trying` branches. +on: + pull_request: + push: + branches: + - staging + - trying jobs: ci:
diff --git a/.github/workflows/size-diff.yml b/.github/workflows/size-diff.yml index 6f8c7d0..2c3b597 100644 --- a/.github/workflows/size-diff.yml +++ b/.github/workflows/size-diff.yml
@@ -2,7 +2,15 @@ # request is created or modified. name: size-diff -on: pull_request + +# We want to run this on all pull requests. Additionally, Bors needs workflows +# to run on the `staging` and `trying` branches to block merges on them. +on: + pull_request: + push: + branches: + - staging + - trying jobs: size-diff:
diff --git a/bors.toml b/bors.toml index b59819f..4b9b851 100644 --- a/bors.toml +++ b/bors.toml
@@ -1,3 +1,4 @@ status = [ - "continuous-integration/travis-ci/push" -] \ No newline at end of file + "ci", + "size-diff", +]