From d395faeefa9565db691ced84a6f3b2608376b7ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Saparelli?= <felix@passcod.name>
Date: Mon, 30 May 2022 02:44:50 +0000
Subject: [PATCH] Test with MSRV on all platforms (#286)

---
 .github/workflows/merge.yml | 41 +++++++++++++++++++------------------
 bors.toml                   |  4 ++--
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index abfd5e9..db52e08 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -14,12 +14,27 @@ jobs:
   test:
     strategy:
       matrix:
-        platform:
-          - ubuntu
-          - windows
-          - macos
+        include:
+          - name: stable-ubuntu
+            platform: ubuntu
+            toolchain: stable
+          - name: stable-windows
+            platform: windows
+            toolchain: stable
+          - name: stable-macos
+            platform: macos
+            toolchain: stable
+          - name: msrv-ubuntu
+            platform: ubuntu
+            toolchain: 1.58.0
+          - name: msrv-windows
+            platform: windows
+            toolchain: 1.58.0
+          - name: msrv-macos
+            platform: macos
+            toolchain: 1.58.0
 
-    name: Merge test on ${{ matrix.platform }}
+    name: Test on ${{ matrix.platform }} with Rust ${{ matrix.toolchain }}
     runs-on: "${{ matrix.platform }}-latest"
 
     steps:
@@ -27,21 +42,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: stable
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-
-  msrv:
-    name: Merge test on MSRV
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: 1.58.0
+          toolchain: "${{ matrix.toolchain }}"
           override: true
       - uses: actions-rs/cargo@v1
         with:
diff --git a/bors.toml b/bors.toml
index cccdd19..efd0d30 100644
--- a/bors.toml
+++ b/bors.toml
@@ -1,7 +1,7 @@
-status = ["Merge test on %"]
+status = ["Test on %"]
 use_squash_merge = true
 delete_merged_branches = true
 update_base_for_deletes = true
 
 # Disabled until https://github.com/bors-ng/bors-ng/issues/1434 is fixed
-#pr_status = ["PR check on ubuntu"]
+#pr_status = ["PR check on %"]