Merge #18

18: Add bors r=JoelWachsler a=JoelWachsler



Co-authored-by: Joel Wachsler <JoelWachsler@users.noreply.github.com>

.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
 

.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

.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
 

.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
 

bors.toml

@@ -0,0 +1,6 @@
+delete_merged_branches = true
+update_base_for_deletes = true
+
+status = [
+  "test"
+]

qbittorrent-web-api-gen/tests/return_type_enum.rs

@@ -17,7 +17,7 @@ async fn main() -> Result<()> {
     const TORRENT_URL: &str = "http://www.legittorrents.info/download.php?id=5cc013e801095be61d768e609e3039da58616fd0&f=Oddepoxy%20-%20Oddepoxy%20(2013)%20[OGG%20320%20CBR].torrent";
     let _ = api.torrent_management().add(TORRENT_URL).send().await?;
 
-    let mut tries = 5;
+    let mut tries = 10;
     while tries > 0 {
         let info = api.torrent_management().info().send().await?;
         if let Some(first) = &info.get(0) {

qbittorrent-web-api-gen/tests/return_type_with_optional_params.rs

@@ -17,7 +17,7 @@ async fn main() -> Result<()> {
     const TORRENT_URL: &str = "http://www.legittorrents.info/download.php?id=5cc013e801095be61d768e609e3039da58616fd0&f=Oddepoxy%20-%20Oddepoxy%20(2013)%20[OGG%20320%20CBR].torrent";
     let _ = api.torrent_management().add(TORRENT_URL).send().await?;
 
-    let mut tries = 5;
+    let mut tries = 10;
     while tries > 0 {
         let info = api.torrent_management().info().send().await?;
         if let Some(first) = &info.get(0) {