Add Bors Integration

.github/workflows/e2e.yml

@@ -2,14 +2,14 @@ name: End-to-end test
 
 on:
   push:
-    branches: [master, main, force_test, release-*]
+    branches: [master, main, force_test, release-*, staging, trying]
   pull_request:
     branches: [master, main, force_test, release-*]
 
 jobs:
 
   build:
-    name: Run
+    name: Bash End-to-End Tests
     runs-on: ubuntu-latest
     steps:
 

.github/workflows/go.yml

@@ -2,14 +2,14 @@ name: Go
 
 on:
   push:
-    branches: [master, main, force_test, release-*]
+    branches: [master, main, force_test, release-*, staging, trying]
   pull_request:
     branches: ['**']
 
 jobs:
 
   build:
-    name: Build
+    name: Build and Lint
     runs-on: ubuntu-latest
     steps:
 
@@ -54,7 +54,7 @@ jobs:
       run: go build -v ./...
 
   test:
-    name: Test
+    name: Go Tests
     runs-on: ubuntu-latest
     steps:
 
@@ -94,7 +94,7 @@ jobs:
       if: ${{ always() }}
       uses: actions/upload-artifact@v2
       with:
-        name: complete-test-run.log 
+        name: complete-test-run.log
         path: complete-test-run.log
         retention-days: 5
 
@@ -104,7 +104,7 @@ jobs:
         git diff --exit-code
 
   test-end-to-end:
-    name: Test end-to-end extension combinations
+    name: Go End-to-End Tests
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -161,6 +161,24 @@ jobs:
       if: ${{ always() }}
       uses: actions/upload-artifact@v2
       with:
-        name: ${{ matrix.test-setups.shortname }}-test-run.log 
+        name: ${{ matrix.test-setups.shortname }}-test-run.log
         path: ${{ matrix.test-setups.shortname }}-test-run.log
         retention-days: 5
+
+
+
+  # Added to summarize the matrix (otherwise we would need to list every single
+  # job in bors.toml)
+  tests-result:
+    name: Go End-to-End Test Results
+    if: always()
+    needs:
+      - test-end-to-end
+    runs-on: ubuntu-latest
+    steps:
+      - name: Mark the job as a success
+        if: needs.test-end-to-end.result == 'success'
+        run: exit 0
+      - name: Mark the job as a failure
+        if: needs.test-end-to-end.result != 'success'
+        run: exit 1

bors.toml

@@ -0,0 +1,4 @@
+status = ["Build and Lint", "Go Tests", "Go End-to-End Test Results", "Bash End-to-End Tests"]
+delete-merged-branches = true
+required_approvals = 1
+timeout_sec = 3600 # one hours