Merge #686

686: simplify ci strategy r=Emilgardis a=burrbull



Co-authored-by: Andrey Zgarbul <[email protected]>

Author: bors[bot]

.github/workflows/ci.yml

@@ -46,39 +46,35 @@ jobs:
     needs: [check]
     strategy:
       matrix:
-        # All generated code should be running on stable now
-        rust: [stable]
-
-        # All vendor files we want to test on stable
-        vendor: [Atmel, Freescale, Fujitsu, GD32, Holtek, Microchip, Nordic, Nuvoton, NXP, RISC-V, SiliconLabs, Spansion, STMicro, Toshiba]
-
         # Options are all, none, strict and const
-        options: [all, none]
-        exclude:
-          - vendor: Fujitsu
-            options: all
-          - vendor: Spansion
-            options: all
-          - vendor: STMicro
-            options: all
-          - vendor: Nuvoton
-            options: all
-          - vendor: Microchip
-            options: all
-          - vendor: RISC-V
-            options: all
         include:
+          - { rust: stable, vendor: Atmel, options: all }
+          - { rust: stable, vendor: Atmel, options: "" }
+          - { rust: stable, vendor: Freescale, options: all }
+          - { rust: stable, vendor: Freescale, options: "" }
+          - { rust: stable, vendor: Fujitsu, options: "" }
+          - { rust: stable, vendor: GD32, options: all }
+          - { rust: stable, vendor: GD32, options: "" }
+          - { rust: stable, vendor: Holtek, options: all }
+          - { rust: stable, vendor: Holtek, options: "" }
+          - { rust: stable, vendor: Microchip, options: "" }
+          - { rust: stable, vendor: Nordic, options: all }
+          - { rust: stable, vendor: Nordic, options: "" }
+          - { rust: stable, vendor: Nuvoton, options: "" }
+          - { rust: stable, vendor: NXP, options: all }
+          - { rust: stable, vendor: NXP, options: "" }
+          - { rust: stable, vendor: RISC-V, options: "" }
+          - { rust: stable, vendor: SiliconLabs, options: all }
+          - { rust: stable, vendor: SiliconLabs, options: "" }
+          - { rust: stable, vendor: Spansion, options: "" }
+          - { rust: stable, vendor: STMicro, options: "" }
+          - { rust: stable, vendor: Toshiba, options: all }
+          - { rust: stable, vendor: Toshiba, options: "" }
           # Test MSRV
-          - rust: 1.60.0
-            vendor: Nordic
-
-          # Use nightly for architectures which don't support stable
-          - rust: nightly
-            vendor: OTHER
-
+          - { rust: 1.60.0, vendor: Nordic, options: "" }
           # Use nightly for architectures which don't support stable
-          - rust: nightly
-            vendor: Espressif
+          - { rust: nightly, vendor: OTHER, options: "" }
+          - { rust: nightly, vendor: Espressif, options: "" }
 
     steps:
       - uses: actions/checkout@v3
@@ -125,7 +121,7 @@ jobs:
       - name: Run CI script
         env:
           VENDOR: RISC-V
-          OPTIONS: all
+          OPTIONS: ""
           COMMAND: clippy
         run: bash ci/script.sh
 

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+- simplify ci strategy
+
 ## [v0.27.1] - 2022-10-25
 
 - fix cli error with --help/version

ci/script.sh

@@ -9,7 +9,7 @@ test_svd() {
 
     # NOTE we care about errors in svd2rust, but not about errors / warnings in rustfmt
     pushd $td
-    RUST_BACKTRACE=1 svd2rust $strict $const_generic $derive_more -i ${1}.svd
+    RUST_BACKTRACE=1 svd2rust $options -i ${1}.svd
 
     mv lib.rs src/lib.rs
 
@@ -23,7 +23,7 @@ test_svd_for_target() {
 
     # NOTE we care about errors in svd2rust, but not about errors / warnings in rustfmt
     pushd $td
-    RUST_BACKTRACE=1 svd2rust --target $1 -i input.svd
+    RUST_BACKTRACE=1 svd2rust $options --target $1 -i input.svd
 
     mv lib.rs src/lib.rs
 
@@ -41,29 +41,10 @@ main() {
 
     case $OPTIONS in
         all)
-            const_generic="--const_generic"
-            strict="--strict"
-            derive_more="--derive_more"
-            ;;
-        strict)
-            const_generic=""
-            strict="--strict"
-            derive_more=""
-            ;;
-        const)
-            const_generic="--const_generic"
-            strict=""
-            derive_more=""
-            ;;
-        derive_more)
-            const_generic=""
-            strict=""
-            derive_more="--derive_more"
+            options="--const_generic --strict --derive_more"
             ;;
         *)
-            const_generic=""
-            strict=""
-            derive_more=""
+            options=$OPTIONS
             ;;
     esac
 
@@ -72,7 +53,7 @@ main() {
     echo 'cortex-m = "0.7.4"' >> $td/Cargo.toml
     echo 'cortex-m-rt = "0.7.1"' >> $td/Cargo.toml
     echo 'vcell = "0.1.3"' >> $td/Cargo.toml
-    if [ $derive_more ]; then
+    if [[ "$options" == *"--derive_more"* ]]; then
         echo 'derive_more = "0.99"' >> $td/Cargo.toml
     fi
     echo '[profile.dev]' >> $td/Cargo.toml