Merge #208

208: Fix bors integration r=lnicola a=michaelkirk - [x] I agree to follow the project's [code of conduct](https://github.com/georust/gdal/blob/master/CODE_OF_CONDUCT.md). - [x] I added an entry to `CHANGES.md` if knowledge of this change could be valuable to users. --- I think the elements in `status` need to match all the GH Action job names we require to succeed. Co-authored-by: Michael Kirk <[email protected]>
georust · Aug 6, 2021 · 6a34a69 · 6a34a69
2 parents ab05ff2 + 822deaa
commit 6a34a69
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, trying, staging ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, trying, staging ]
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 

diff --git a/bors.toml b/bors.toml
@@ -1,3 +1,5 @@
 status = [
-    "ci result",
-]
+    "ci ubuntu-20.04",
+    "ci ubuntu-20.04 (--all-features)",
+    "clippy"
+]