From 15b5d39cec6b87c8c18bee8b894cd6cf2b4b01f5 Mon Sep 17 00:00:00 2001
From: Joel Wachsler <JoelWachsler@users.noreply.github.com>
Date: Mon, 11 Jul 2022 14:14:17 +0000
Subject: [PATCH] Add bors

---
 .github/workflows/ci.yml      | 28 ++++++++++++++++++++++------
 .github/workflows/extra.yml   |  8 +++++++-
 .github/workflows/publish.yml | 15 ++++++++++++---
 .github/workflows/release.yml |  9 ++++++++-
 4 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bb50c19..730fe41 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,17 +1,25 @@
 name: CI
+
 on:
   push:
-    branches:
-      - '**' 
+    branches: [main, staging, trying]
+  pull_request:
+    branches: [main]
+
+env:
+  CARGO_TERM_COLOR: always
+
 jobs:
   test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
+
     services:
       # Needed for tests to pass
       qbittorrent:
         image: linuxserver/qbittorrent:4.4.3
         ports:
           - 8080:8080
+
     steps:
       - uses: actions/checkout@v3
 
@@ -27,14 +35,21 @@ jobs:
           profile: minimal
           override: true
 
+      - name: Build
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --verbose
+
       - name: Run tests
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --workspace
+          args: --workspace --verbose
 
   fmt:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
+
     steps:
       - uses: actions/checkout@v3
 
@@ -52,7 +67,8 @@ jobs:
           args: --all -- --check
 
   clippy:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
+
     steps:
       - uses: actions/checkout@v3
 
diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml
index b81442b..1c99e6f 100644
--- a/.github/workflows/extra.yml
+++ b/.github/workflows/extra.yml
@@ -1,13 +1,19 @@
 name: Extra
+
 on:
   push:
     branches:
       - main
+
+env:
+  CARGO_TERM_COLOR: always
+
 jobs:
   # Need to have the same name as where this dependency is used,
   # otherwise the cache key won't be the same.
   release:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
+
     steps:
       # build and cache this here in order to reuse it's cache in feature branches
       - name: Install cargo-edit
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 33c4d8b..1aae0b0 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,13 +1,20 @@
 name: Publish
+
 on:
   push:
     branches:
-      - 'main' 
+      - main
+
+env:
+  CARGO_TERM_COLOR: always
+
 jobs:
   tag:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
+
     outputs:
       should_publish: ${{ steps.create-and-push-tag.outputs.should_publish }}
+
     steps:
       - uses: actions/checkout@v3
 
@@ -32,9 +39,11 @@ jobs:
           echo "The result is: ${{ steps.create-and-push-tag.outputs.should_publish }}"
 
   publish:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
+
     needs: tag
     if: ${{ needs.tag.outputs.should_publish == 'true' }}
+
     steps:
       - uses: actions/checkout@v3
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 33c9038..81be97b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,11 +1,18 @@
 name: Prepare new release
+
 on:
   create:
     branches:
+
+env:
+  CARGO_TERM_COLOR: always
+
 jobs:
   release:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
+
     if: "startsWith(github.ref, 'refs/heads/create_release/')"
+
     steps:
       - uses: actions/checkout@v3