Skip to content

Commit 7922184

Browse files
robamurobamu
committed
Update cargo regress tool and move CI
1 parent a2740d2 commit 7922184

File tree

9 files changed

+2798
-2000
lines changed

9 files changed

+2798
-2000
lines changed

‎.github/workflows/ci.yml

Lines changed: 36 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -55,45 +55,42 @@ 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 }
59+
# TODO: There are currently no working Atmel tests...
60+
# - { rust: stable, vendor: Atmel }
61+
# - { rust: stable, vendor: Atmel, options: "-- --strict --atomics" }
62+
- { rust: stable, vendor: Freescale }
63+
- { rust: stable, vendor: Freescale, options: "-- --strict --atomics" }
64+
- { rust: stable, vendor: Fujitsu }
65+
- { rust: stable, vendor: Fujitsu, options: "-- --strict --atomics" }
66+
- { rust: stable, vendor: Holtek }
67+
- { rust: stable, vendor: Holtek, options: "-- --strict --atomics" }
68+
- { rust: stable, vendor: Atmel }
69+
- { rust: stable, vendor: Atmel, options: "-- --strict --atomics" }
70+
- { rust: stable, vendor: Microchip }
71+
- { rust: stable, vendor: Microchip, options: "-- --atomics" }
72+
- { rust: stable, vendor: Nordic }
73+
- { rust: stable, vendor: Nordic, options: "-- --strict --atomics" }
74+
- { rust: 1.76.0, vendor: Nordic, options: "-- --strict --atomics" }
75+
- { rust: stable, vendor: Nuvoton }
76+
- { rust: stable, vendor: Nuvoton, options: "-- --strict --atomics" }
77+
- { rust: stable, vendor: NXP }
78+
- { rust: stable, vendor: NXP, options: "-- --strict --atomics" }
79+
- { rust: stable, vendor: RISC-V }
80+
- { rust: stable, vendor: RISC-V, options: "-- --strict --atomics" }
8181
- { 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: "" }
89-
# 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" }
82+
- { rust: stable, vendor: SiliconLabs, options: "-- --strict --atomics" }
83+
- { rust: stable, vendor: Spansion }
84+
- { rust: stable, vendor: Spansion, options: "-- --strict --atomics" }
85+
- { rust: stable, vendor: STMico }
86+
- { rust: stable, vendor: STMico, options: "-- --atomics" }
87+
- { rust: stable, vendor: STMico, options: "-- --strict -f enum_value::p: --max-cluster-size --atomics --atomics-feature atomics --impl-debug --impl-defmt defmt" }
88+
- { rust: stable, vendor: Toschiba }
89+
- { rust: stable, vendor: Toschiba, options: "-- --strict --atomics" }
90+
- { rust: stable, vendor: TexasInstruments }
91+
- { rust: stable, vendor: TexasInstruments, options: "-- --atomics" }
92+
- { rust: stable, vendor: Espressif }
93+
- { rust: stable, vendor: Espressif, options: "-- --atomics" }
9794

9895
steps:
9996
- uses: actions/checkout@v4
@@ -109,13 +106,8 @@ jobs:
109106
run: |
110107
cargo install svd2rust --path .
111108
112-
- name: Run CI script for `${{ matrix.vendor }}` under rust `${{ matrix.rust }}` with options=`${{ matrix.options }}`
113-
env:
114-
VENDOR: ${{ matrix.vendor }}
115-
OPTIONS: ${{ matrix.options }}
116-
COMMAND: check
117-
RUST_TOOLCHAIN: ${{ matrix.rust }}
118-
run: bash ci/script.sh
109+
- name: Run regression tool
110+
run: cargo regress tests -m ${{ matrix.vendor }} ${{ matrix.options }}
119111

120112
ci-clippy:
121113
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)