Skip to content

Commit 4542367

Browse files
romancardenasAfoHT
authored andcommitted
Configure CI for new backends
1 parent 6b021de commit 4542367

File tree

3 files changed

+8
-23
lines changed

3 files changed

+8
-23
lines changed

.github/workflows/build.yml

+4-16
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ jobs:
155155
matrix:
156156
backend:
157157
- riscv32-imc-clint
158-
- riscv32-imac-clint
158+
- riscv32-imc-mecall
159159
toolchain:
160160
- stable
161161
steps:
@@ -168,18 +168,12 @@ jobs:
168168
169169
- name: Configure Rust target
170170
run: |
171-
rustup target add riscv32imac-unknown-none-elf
172171
rustup target add riscv32imc-unknown-none-elf
173172
174173
- name: Cache Dependencies
175174
uses: Swatinem/rust-cache@v2
176175

177176
- name: Check the examples
178-
if: ${{ matrix.backend == 'riscv32-imc-clint' }}
179-
run: cargo xtask --platform hifive1 --backend ${{ matrix.backend }} --exampleexclude static example-check
180-
181-
- name: Check the examples
182-
if: ${{ matrix.backend != 'riscv32-imc-clint' }}
183177
run: cargo xtask --platform hifive1 --backend ${{ matrix.backend }} example-check
184178

185179
# Platform esp32c3: verify all examples, checks
@@ -341,7 +335,7 @@ jobs:
341335
matrix:
342336
backend:
343337
- riscv32-imc-clint
344-
- riscv32-imac-clint
338+
- riscv32-imc-mecall
345339
toolchain:
346340
- stable
347341
steps:
@@ -355,7 +349,6 @@ jobs:
355349
356350
- name: Configure Rust target
357351
run: |
358-
rustup target add riscv32imac-unknown-none-elf
359352
rustup target add riscv32imc-unknown-none-elf
360353
361354
- name: Add Rust component llvm-tools-preview
@@ -389,11 +382,6 @@ jobs:
389382
which qemu-system-riscv32
390383
391384
- name: Run-pass tests
392-
if: ${{ matrix.backend == 'riscv32-imc-clint' }}
393-
run: cargo xtask --deny-warnings --platform hifive1 --backend ${{ matrix.backend }} --exampleexclude static qemu
394-
395-
- name: Run-pass tests
396-
if: ${{ matrix.backend != 'riscv32-imc-clint' }}
397385
run: cargo xtask --deny-warnings --platform hifive1 --backend ${{ matrix.backend }} qemu
398386

399387
# Platform esp32c3: verify the example output with run-pass tests
@@ -897,9 +885,9 @@ jobs:
897885
needs:
898886
- formatcheck
899887
- checklm3s6965
900-
# checkhifive1 TODO
888+
# - checkhifive1 TODO
901889
- clippylm3s6965
902-
# clippyhifive1 TODO
890+
# - clippyhifive1 # TODO
903891
- checkexampleslm3s6965
904892
- checkexampleshifive1
905893
- checkexamplesesp32c3

rtic-macros/CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ For each category, *Added*, *Changed*, *Fixed* add new entries at the top!
77

88
## [Unreleased]
99

10+
- Adapt `slic` backends to new version with `mecall`
11+
1012
## [v2.1.1] - 2024-12-06
1113

1214
### Changed

xtask/src/argument_parsing.rs

+2-7
Original file line numberDiff line numberDiff line change
@@ -252,12 +252,7 @@ impl Platforms {
252252
let c = "-C".to_string();
253253
match self {
254254
Platforms::Esp32C3 => vec![c, "link-arg=-Tlinkall.x".to_string()],
255-
Platforms::Hifive1 => vec![
256-
c.clone(),
257-
"link-arg=-Thifive1-link.x".to_string(),
258-
c,
259-
"portable_atomic_target_feature=\"zaamo\"".to_string(),
260-
],
255+
Platforms::Hifive1 => vec![c, "link-arg=-Thifive1-link.x".to_string()],
261256
Platforms::Lm3s6965 => vec![c, "link-arg=-Tlink.x".to_string()],
262257
Platforms::Nrf52840 => vec![
263258
c.clone(),
@@ -315,7 +310,7 @@ impl Platforms {
315310
_ => Err(()),
316311
},
317312
Platforms::Hifive1 => match backend.to_target() {
318-
RISCV32IMC | RISCV32IMAC => Ok(None),
313+
RISCV32IMC => Ok(None),
319314
_ => Err(()),
320315
},
321316
Platforms::Lm3s6965 => match backend.to_target() {

0 commit comments

Comments
 (0)