* Time to do the bors tango
This commit is contained in:
Daniel McNab 2021-02-19 21:15:29 +00:00 committed by GitHub
parent 89a41bc628
commit 59066c4854
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 25 deletions

11
.github/bors.toml vendored Normal file
View File

@ -0,0 +1,11 @@
status = [
"build (stable, windows-latest)",
"build (stable, ubuntu-latest)",
"build (stable, macos-latest)",
"build (nightly, ubuntu-latest)",
"build-wasm (stable, ubuntu-latest)",
"build-wasm (nightly, ubuntu-latest)",
"build-android",
]
use_squash_merge = true

View File

@ -1,10 +1,9 @@
name: CI
on:
push:
branches: [master]
pull_request:
branches: [master]
push:
branches: [main, staging, trying]
env:
CARGO_TERM_COLOR: always

View File

@ -1,22 +0,0 @@
name: Automatic Rebase
on:
issue_comment:
types: [created]
jobs:
rebase:
name: Rebase
# ideally "cart" isn't hard coded here, but there is a bug that prevents org-owned repos from properly populating the OWNER enum
if: github.event.issue.pull_request != '' && startsWith(github.event.comment.body, '/rebase') && (github.event.comment.author_association == 'MEMBER' || github.event.comment.user.login == 'cart')
runs-on: ubuntu-latest
steps:
- name: Checkout the latest code
uses: actions/checkout@v2
with:
token: ${{ secrets.CART_PAT }}
persist-credentials: false
fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
- name: Automatic Rebase
# this specific hash was hand-validated by @cart. please validate new action code before updating
uses: cirrus-actions/rebase@b08442cca46e2ad6c1f3dd24a3320ece8498df75
env:
GITHUB_TOKEN: ${{ secrets.CART_PAT }}