From fbf133da4579cc167518eb88618fd8d3a9207b6f Mon Sep 17 00:00:00 2001
From: Jacob Pratt <jacob@jhpratt.dev>
Date: Mon, 28 Dec 2020 05:15:03 -0500
Subject: [PATCH] Additional targets for scheduled checks

This includes all tier 1 targets and a handful of tier 2 targets.
---
 .github/workflows/build.yaml     | 27 +++++++++++++++------------
 .github/workflows/scheduled.yaml | 32 +++++++++++++++++++++++---------
 2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 3994c9a3aa..016fb5debf 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -16,16 +16,16 @@ on:
 
 jobs:
   check-other-targets:
-    name: Type checking
+    name: Type checking (${{ matrix.target.name }}, ${{ matrix.rust }})
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        rust: [1.40.0, stable]
+        rust: ["1.40", stable]
         target:
-          - { triple: x86_64-unknown-netbsd, has_std: true }
-          - { triple: x86_64-sun-solaris, has_std: true }
-          - { triple: wasm32-wasi, has_std: true }
-          - { triple: thumbv7em-none-eabihf, has_std: false }
+          - { name: NetBSD, triple: x86_64-unknown-netbsd, has_std: true }
+          - { name: Solaris, triple: x86_64-sun-solaris, has_std: true }
+          - { name: wasi, triple: wasm32-wasi, has_std: true }
+          - { name: embedded, triple: thumbv7em-none-eabihf, has_std: false }
 
     steps:
       - name: Checkout sources
@@ -117,12 +117,15 @@ jobs:
           args: --benches --all-features
 
   test:
-    name: Test
-    runs-on: ${{ matrix.os }}
+    name: Test (${{ matrix.os.name }}, ${{ matrix.rust }})
+    runs-on: ${{ matrix.os.value }}
     strategy:
       matrix:
-        rust: [1.40.0, stable]
-        os: [ubuntu-20.04, windows-latest, macOS-latest]
+        rust: ["1.40", stable]
+        os:
+          - { name: Ubuntu, value: ubuntu-20.04 }
+          - { name: Windows, value: windows-latest }
+          - { name: MacOS, value: macOS-latest }
 
     steps:
       - name: Checkout sources
@@ -155,7 +158,7 @@ jobs:
         run: |
           brew install gnu-tar
           echo "/usr/local/opt/gnu-tar/libexec/gnubin" >> $GITHUB_PATH
-        if: matrix.os == 'macOS-latest'
+        if: matrix.os.value == 'macOS-latest'
 
       - name: Cache cargo output
         uses: actions/cache@v2
@@ -164,7 +167,7 @@ jobs:
             ~/.cargo/registry
             ~/.cargo/git
             target
-          key: ${{ runner.os }}-cargo-${{ matrix.rust }}-${{ matrix.os }}-${{ hashFiles('**/Cargo.toml') }}2
+          key: ${{ runner.os }}-cargo-${{ matrix.rust }}-${{ matrix.os.value }}-${{ hashFiles('**/Cargo.toml') }}2
 
       # For speed reasons, it's worth it to just check the feature powerset and
       # test with everything enabled. As features are additive, the tests ensure
diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml
index 7886828924..c55684910c 100644
--- a/.github/workflows/scheduled.yaml
+++ b/.github/workflows/scheduled.yaml
@@ -35,19 +35,33 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
 
   check-other-targets:
-    name: Type checking
+    name: Type checking (${{ matrix.target.name }})
     runs-on: ubuntu-20.04
     strategy:
       matrix:
         target:
-          - { triple: x86_64-unknown-netbsd, has_std: true }
-          - { triple: x86_64-sun-solaris, has_std: true }
-          - { triple: wasm32-wasi, has_std: true }
-          - { triple: thumbv7em-none-eabihf, has_std: false }
-          - { triple: x86_64-apple-darwin, has_std: true }
-          - { triple: x86_64-fuchsia, has_std: true }
-          - { triple: x86_64-linux-android, has_std: true }
-          - { triple: x86_64-pc-windows-msvc, has_std: true }
+          # All tier 1 platforms as of 2020-12-28
+          - { name: "ARM64 Linux", triple: aarch64-unknown-linux-gnu, has_std: true }
+          - { name: "32-bit MinGW", triple: i686-pc-windows-gnu, has_std: true }
+          - { name: "32-bit MSVC", triple: i686-pc-windows-msvc, has_std: true }
+          - { name: "32-bit Linux", triple: i686-unknown-linux-gnu, has_std: true }
+          - { name: "64-bit macOS", triple: x86_64-apple-darwin, has_std: true }
+          - { name: "64-bit MinGW", triple: x86_64-pc-windows-gnu, has_std: true }
+          - { name: "64-bit MSVC", triple: x86_64-pc-windows-msvc, has_std: true }
+          - { name: "64-bit Linux", triple: x86_64-unknown-linux-gnu, has_std: true }
+          # Select tier 2 platforms as of 2020-12-28
+          # - { name: "ARM64 macOS", triple: aarch64-apple-darwin, has_std: true } # not present in Rust 1.40
+          - { name: "ARM64 iOS", triple: aarch64-apple-ios, has_std: true }
+          - { name: "ARM64 Fuchsia", triple: aarch64-fuchsia, has_std: true }
+          - { name: "ARM64 Android", triple: aarch64-linux-android, has_std: true }
+          - { name: "Bare Cortex", triple: thumbv7em-none-eabihf, has_std: false }
+          - { name: "WebAssembly", triple: wasm32-unknown-unknown, has_std: true }
+          - { name: "WebAssembly with WASI", triple: wasm32-wasi, has_std: true }
+          - { name: "64-bit x86 iOS", triple: x86_64-apple-ios, has_std: true }
+          - { name: "64-bit Fuchsia", triple: x86_64-fuchsia, has_std: true }
+          - { name: "64-bit x86 Android", triple: x86_64-linux-android, has_std: true }
+          - { name: "64-bit Solaris", triple: x86_64-sun-solaris, has_std: true }
+          - { name: "NetBSD", triple: x86_64-unknown-netbsd, has_std: true }
 
     steps:
       - name: Checkout sources