From 0fac17493697b14f2bb7386bf778ea42804ec514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Thu, 23 Feb 2023 23:07:06 +0100
Subject: [PATCH] CI: Use backend instead of target

---
 .github/workflows/build.yml | 40 +++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 36402a1f01..0d64ef5630 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -191,11 +191,11 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        target:
-          - thumbv7m-none-eabi
-          - thumbv6m-none-eabi
-          - thumbv8m.base-none-eabi
-          - thumbv8m.main-none-eabi
+        backend:
+          - thumbv7
+          - thumbv6
+          - thumbv8-base
+          - thumbv8-main
         toolchain:
           - nightly
     steps:
@@ -206,19 +206,23 @@ jobs:
         run: |
           rustup override set ${{ matrix.toolchain }}
 
-      - name: Configure Rust target (${{ matrix.target }})
-        run: rustup target add ${{ matrix.target }}
+      - name: Configure Rust target (v6, v7, v8.b v8.m)
+        run: |
+          rustup target add thumbv7m-none-eabi
+          rustup target add thumbv6m-none-eabi
+          rustup target add thumbv8m.base-none-eabi
+          rustup target add thumbv8m.main-none-eabi
 
       - name: Cache Dependencies
         uses: Swatinem/rust-cache@v2
 
       - name: Check the examples
-        if: ${{ matrix.target == 'thumbv8m.base-none-eabi' }}
-        run: cargo xtask --verbose --target ${{ matrix.target }} --exampleexclude pool example-check
+        if: ${{ matrix.backend == 'thumbv8m-base' }}
+        run: cargo xtask --verbose --backend ${{ matrix.backend }} --exampleexclude pool example-check
 
       - name: Check the examples
-        if: ${{ matrix.target != 'thumbv8m.base-none-eabi' }}
-        run: cargo xtask --verbose --target ${{ matrix.target }} example-check
+        if: ${{ matrix.backend != 'thumbv8m-base' }}
+        run: cargo xtask --verbose --backend ${{ matrix.backend }} example-check
 
   # Verify the example output with run-pass tests
   testexamples:
@@ -226,9 +230,9 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        target:
-          - thumbv7m-none-eabi
-          - thumbv6m-none-eabi
+        backend:
+          - thumbv7
+          - thumbv6
         toolchain:
           - nightly
     steps:
@@ -240,8 +244,10 @@ jobs:
           rustup set profile minimal
           rustup override set ${{ matrix.toolchain }}
 
-      - name: Configure Rust target (${{ matrix.target }})
-        run: rustup target add ${{ matrix.target }}
+      - name: Configure Rust target (v6, v7)
+        run: |
+          rustup target add thumbv7m-none-eabi
+          rustup target add thumbv6m-none-eabi
 
       - name: Add Rust component llvm-tools-preview
         run: rustup component add llvm-tools-preview
@@ -263,7 +269,7 @@ jobs:
         run: sed -i 's,//deny_warnings_placeholder_for_ci,#![deny(warnings)],' src/lib.rs
 
       - name: Run-pass tests
-        run: cargo xtask --verbose --target ${{ matrix.target }} qemu 
+        run: cargo xtask --verbose --backend ${{ matrix.backend }} qemu 
 
   # Run test suite
   testsrtic: