@@ -55,45 +55,47 @@ jobs:
5555 needs : [check]
5656 strategy :
5757 matrix :
58- # Options are all, none, strict and const
5958 include :
60- - { rust: stable, vendor: Atmel, options: all }
61- - { rust: stable, vendor: Atmel, options: "" }
62- - { rust: stable, vendor: Freescale, options: all }
63- - { rust: stable, vendor: Freescale, options: "" }
64- - { rust: stable, vendor: Fujitsu, options: "" }
65- - { rust: stable, vendor: Fujitsu, options: "--atomics" }
66- - { rust: stable, vendor: GD32, options: all }
67- - { rust: stable, vendor: GD32, options: "" }
68- - { rust: stable, vendor: Holtek, options: all }
69- - { rust: stable, vendor: Holtek, options: "" }
70- - { rust: stable, vendor: Microchip, options: "" }
71- - { rust: stable, vendor: Microchip, options: "--atomics" }
72- - { rust: stable, vendor: Nordic, options: all }
73- - { rust: stable, vendor: Nordic, options: "" }
74- - { rust: stable, vendor: Nuvoton, options: "" }
75- - { rust: stable, vendor: Nuvoton, options: "--atomics" }
76- - { rust: stable, vendor: NXP, options: all }
77- - { rust: stable, vendor: NXP, options: "" }
78- - { rust: stable, vendor: RISC-V, options: "" }
79- - { rust: stable, vendor: RISC-V, options: "--atomics" }
80- - { rust: stable, vendor: SiliconLabs, options: all }
81- - { rust: stable, vendor: SiliconLabs, options: "" }
82- - { rust: stable, vendor: Spansion, options: "" }
83- - { rust: stable, vendor: Spansion, options: "--atomics" }
84- - { rust: stable, vendor: STMicro, options: "" }
85- - { rust: stable, vendor: STMicro, options: "--atomics" }
86- - { rust: stable, vendor: STM32-patched, options: "--strict -f enum_value::p: --max-cluster-size --atomics --atomics-feature atomics --impl-debug --impl-defmt defmt" }
87- - { rust: stable, vendor: Toshiba, options: all }
88- - { rust: stable, vendor: Toshiba, options: "" }
59+ - { vendor: Atmel, options: "" }
60+ - { vendor: Atmel, options: "-- --strict --atomics" }
61+ - { vendor: Freescale, options: "" }
62+ - { vendor: Freescale, options: "-- --strict --atomics" }
63+ - { vendor: Fujitsu, options: "" }
64+ - { vendor: Fujitsu, options: "-- --strict --atomics" }
65+ - { vendor: GD32, options: "" }
66+ - { vendor: GD32, options: "-- --strict --atomics" }
67+ - { vendor: Holtek, options: "" }
68+ - { vendor: Holtek, options: "-- --strict --atomics" }
69+ - { vendor: Atmel, options: "" }
70+ - { vendor: Atmel, options: "-- --strict --atomics" }
71+ - { vendor: Microchip, options: "" }
72+ - { vendor: Microchip, options: "-- --atomics" }
73+ - { vendor: Nordic, options: "" }
74+ - { vendor: Nordic, options: "-- --strict --atomics" }
75+ - { vendor: Nuvoton, options: "" }
76+ - { vendor: Nuvoton, options: "-- --strict --atomics" }
77+ - { vendor: NXP, options: "" }
78+ - { vendor: NXP, options: "-- --strict --atomics" }
79+ - { vendor: RISC-V, options: "" }
80+ - { vendor: RISC-V, options: "-- --strict --atomics" }
81+ - { vendor: SiliconLabs, options: "" }
82+ - { vendor: SiliconLabs, options: "-- --strict --atomics" }
83+ - { vendor: Spansion, options: "" }
84+ - { vendor: Spansion, options: "-- --strict --atomics" }
85+ - { vendor: STMico, options: "" }
86+ - { vendor: STMico, options: "-- --atomics" }
87+ - { vendor: Toschiba, options: "" }
88+ - { vendor: Toschiba, options: "-- --strict --atomics" }
89+ - { vendor: MSP430, options: "" }
90+ - { vendor: MSP430, options: "-- --atomics" }
91+ - { vendor: Espressif, options: "" }
92+ - { vendor: Espressif, options: "-- --atomics" }
93+
94+ # This was only applied on the patched files.. create own vendor group in tests.yml?
95+ # - { rust: stable, vendor: STM32-patched, options: "--strict -f enum_value::p: --max-cluster-size --atomics --atomics-feature atomics --impl-debug --impl-defmt defmt" }
8996 # Test MSRV
90- - { rust: 1.76.0, vendor: Nordic, options: "" }
91- # Use nightly for architectures which don't support stable
92- - { rust: nightly, vendor: MSP430, options: "--atomics" }
93- - { rust: nightly, vendor: MSP430, options: "" }
94- # Workaround for _1token0
95- - { rust: nightly-2024-09-25, vendor: Espressif, options: "--atomics --ident-formats-theme legacy" }
96- - { rust: nightly-2024-09-25, vendor: Espressif, options: "--ident-format register:::Reg" }
97+ # TODO: Update cargo regress so toolchain can be specified as CLI.
98+ # - { rust: 1.76.0, vendor: Nordic, options: "" }
9799
98100 steps :
99101 - uses : actions/checkout@v4
@@ -110,8 +112,7 @@ jobs:
110112 cargo install svd2rust --path .
111113
112114 - name : Run regression tool
113- run : cargo regress tests -m STMico
114- run : cargo regress tests -m STMico -- --atomics
115+ run : cargo regress tests -m ${{ matrix.vendor }} -- ${{ matrix.options }}
115116
116117 ci-clippy :
117118 runs-on : ubuntu-latest
0 commit comments