Bors (bevyengine#1482)

* Time to do the bors tango
jak6jak · Feb 19, 2021 · 59066c4 · 59066c4
1 parent 89a41bc
commit 59066c4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 25 deletions.
diff --git a/.github/bors.toml b/.github/bors.toml
@@ -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
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,10 +1,9 @@
 name: CI
 
 on:
-  push:
-    branches: [master]
   pull_request:
-    branches: [master]
+  push:
+    branches: [main, staging, trying]
 
 env:
   CARGO_TERM_COLOR: always

diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml