ci: Add bors support (#24)

.github/workflows/ci.yml

@@ -6,6 +6,10 @@ concurrency:
 
 on:
   workflow_dispatch:
+  push:
+    branches:
+      - staging
+      - trying
   pull_request:
     branches: [main]
     paths:
@@ -95,3 +99,12 @@ jobs:
         timeout-minutes: 20
         run: make integration_tests
 
+  done:
+    name: Done
+    needs:
+      - check
+      - integration_tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Done
+        run: echo "Done!"

.gitignore

@@ -2,10 +2,6 @@
 # will have compiled files and executables
 /target/
 
-# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
-# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
-Cargo.lock
-
 # These are backup files generated by rustfmt
 **/*.rs.bk
-*.log
+*.log

bors.toml

@@ -0,0 +1,4 @@
+status = ["Done"]
+use_squash_merge = true
+delete_merged_branches = true
+timeout_sec = 3600 # 45 mins