Merge #380

380: Simplify CI workflow r=thomaseizinger a=thomaseizinger

Some patches extracted out of https://github.com/comit-network/xmr-btc-swap/pull/371.

Co-authored-by: Thomas Eizinger <thomas@eizinger.io>

.github/workflows/ci.yml

@@ -83,18 +83,11 @@ jobs:
           path: target/${{ matrix.target }}/debug/asb
 
   test:
-    env:
-      RUST_TEST_TASKS: 2
     strategy:
       matrix:
-        include:
-          - target: x86_64-unknown-linux-gnu
-            os: ubuntu-latest
-          - target: x86_64-apple-darwin
-            os: macos-latest
+        os: [ ubuntu-latest, macos-latest ]
     runs-on: ${{ matrix.os }}
     steps:
-
       - name: Checkout sources
         uses: actions/checkout@v2
 
@@ -111,8 +104,6 @@ jobs:
         run: cargo test --package swap --lib --all-features
 
   docker_tests:
-    env:
-      TARGET: x86_64-unknown-linux-gnu
     strategy:
       matrix:
         test_name: [

bors.toml

@@ -4,8 +4,8 @@ status = [
     "build (armv7-unknown-linux-gnueabihf, ubuntu-latest)",
     "build (x86_64-apple-darwin, macos-latest)",
     "build (x86_64-pc-windows-msvc, windows-latest)",
-    "test (x86_64-unknown-linux-gnu, ubuntu-latest)",
-    "test (x86_64-apple-darwin, macos-latest)",
+    "test (ubuntu-latest)",
+    "test (macos-latest)",
     "docker_tests (happy_path)",
     "docker_tests (happy_path_restart_bob_after_xmr_locked)",
     "docker_tests (happy_path_restart_bob_before_xmr_locked)",