From 8767af8dd3be2c4eba38a899dc81d880515fbd90 Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Wed, 24 Mar 2021 16:02:43 +1100 Subject: [PATCH] Simplify matrix for test job --- .github/workflows/ci.yml | 7 +------ bors.toml | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index edbbf5a3..656a5521 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,14 +84,9 @@ jobs: 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 diff --git a/bors.toml b/bors.toml index 9a5198e7..294fc31b 100644 --- a/bors.toml +++ b/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)",