Skip to content

Commit e70afe4

Browse files
committed
adjust the workspace
1 parent b5a6c0b commit e70afe4

File tree

13 files changed

+86
-316
lines changed

13 files changed

+86
-316
lines changed

.github/workflows/changelog.yaml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ jobs:
1919
filters: |
2020
riscv:
2121
- 'riscv/**'
22-
riscv-rt:
23-
- 'riscv-rt/**'
2422
riscv-pac:
2523
- 'riscv-pac/**'
24+
riscv-rt:
25+
- 'riscv-rt/**'
26+
riscv-semihosting:
27+
- 'riscv-semihosting/**'
2628
2729
- name: Check for CHANGELOG.md (riscv)
2830
if: steps.changes.outputs.riscv == 'true'
@@ -32,6 +34,14 @@ jobs:
3234
skipLabels: 'skip changelog'
3335
missingUpdateErrorMessage: 'Please add a changelog entry in the riscv/CHANGELOG.md file.'
3436

37+
- name: Check for CHANGELOG.md (riscv-pac)
38+
if: steps.changes.outputs.riscv-pac == 'true'
39+
uses: dangoslen/changelog-enforcer@v3
40+
with:
41+
changeLogPath: ./riscv-pac/CHANGELOG.md
42+
skipLabels: 'skip changelog'
43+
missingUpdateErrorMessage: 'Please add a changelog entry in the riscv-pac/CHANGELOG.md file.'
44+
3545
- name: Check for CHANGELOG.md (riscv-rt)
3646
if: steps.changes.outputs.riscv-rt == 'true'
3747
uses: dangoslen/changelog-enforcer@v3
@@ -40,10 +50,10 @@ jobs:
4050
skipLabels: 'skip changelog'
4151
missingUpdateErrorMessage: 'Please add a changelog entry in the riscv-rt/CHANGELOG.md file.'
4252

43-
- name: Check for CHANGELOG.md (riscv-pac)
44-
if: steps.changes.outputs.riscv-pac == 'true'
53+
- name: Check for CHANGELOG.md (riscv-semihosting)
54+
if: steps.changes.outputs.riscv-semihosting == 'true'
4555
uses: dangoslen/changelog-enforcer@v3
4656
with:
47-
changeLogPath: ./riscv-pac/CHANGELOG.md
57+
changeLogPath: ./riscv-semihosting/CHANGELOG.md
4858
skipLabels: 'skip changelog'
49-
missingUpdateErrorMessage: 'Please add a changelog entry in the riscv-pac/CHANGELOG.md file.'
59+
missingUpdateErrorMessage: 'Please add a changelog entry in the riscv-semihosting/CHANGELOG.md file.'
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
on:
2+
push:
3+
branches: [ master, semihosting ]
4+
pull_request:
5+
merge_group:
6+
7+
name: Build check (riscv-semihosting)
8+
9+
jobs:
10+
# We check that the crate builds and links for all the toolchains and targets.
11+
build-riscv:
12+
strategy:
13+
matrix:
14+
# All generated code should be running on stable now, MRSV is 1.60.0
15+
toolchain: [ stable, nightly, 1.60.0 ]
16+
target:
17+
- riscv32i-unknown-none-elf
18+
- riscv32imc-unknown-none-elf
19+
- riscv32imac-unknown-none-elf
20+
- riscv64imac-unknown-none-elf
21+
- riscv64gc-unknown-none-elf
22+
include:
23+
# Nightly is only for reference and allowed to fail
24+
- toolchain: nightly
25+
experimental: true
26+
runs-on: ubuntu-latest
27+
continue-on-error: ${{ matrix.experimental || false }}
28+
steps:
29+
- uses: actions/checkout@v4
30+
- uses: dtolnay/rust-toolchain@master
31+
with:
32+
toolchain: ${{ matrix.toolchain }}
33+
targets: ${{ matrix.target }}
34+
- name: Build (M-mode)
35+
run: cargo build --package riscv-semihosting --target ${{ matrix.target }} --features machine-mode
36+
- name: Build (U-mode)
37+
run: cargo build --package riscv-semihosting --target ${{ matrix.target }} --features=user-mode
38+
39+
# Job to check that all the builds succeeded
40+
build-check:
41+
needs:
42+
- build-riscv
43+
runs-on: ubuntu-latest
44+
if: always()
45+
steps:
46+
- run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ members = [
44
"riscv",
55
"riscv-pac",
66
"riscv-rt",
7+
"riscv-semihosting",
78
]

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This repository contains various crates useful for writing Rust programs on RISC
55
* [`riscv`]: CPU registers access and intrinsics
66
* [`riscv-pac`]: Common traits to be implemented by RISC-V PACs
77
* [`riscv-rt`]: Startup code and interrupt handling
8-
8+
* [`riscv-semihosting`]: Semihosting for RISC-V processors
99

1010
This project is developed and maintained by the [RISC-V team][team].
1111

@@ -22,6 +22,8 @@ Conduct][CoC], the maintainer of this crate, the [RISC-V team][team], promises
2222
to intervene to uphold that code of conduct.
2323

2424
[`riscv`]: https://crates.io/crates/riscv
25+
[`riscv-pac`]: https://crates.io/crates/riscv-pac
2526
[`riscv-rt`]: https://crates.io/crates/riscv-rt
27+
[`riscv-semihosting`]: https://crates.io/crates/riscv-semihosting
2628
[team]: https://github.com/rust-embedded/wg#the-risc-v-team
2729
[CoC]: CODE_OF_CONDUCT.md

riscv-semihosting/.github/workflows/check.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

riscv-semihosting/.github/workflows/doc.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

riscv-semihosting/.github/workflows/fmt.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

riscv-semihosting/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

riscv-semihosting/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
55

66
## [Unreleased]
77

8+
- Moved to the `riscv` Cargo workspace
89
- Bring in API changes from
910
[cortex-m-semihosting](https://github.com/rust-embedded/cortex-m/tree/master/cortex-m-semihosting),
1011
including:

riscv-semihosting/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ categories = ["no-std", "embedded"]
1111
license = "MIT OR Apache-2.0"
1212
name = "riscv-semihosting"
1313
readme = "README.md"
14-
repository = "https://github.com/riscv-rust/riscv-semihosting"
14+
repository = "https://github.com/riscv-rust/riscv"
1515
version = "0.0.1"
1616
edition = "2021"
17-
rust-version = "1.59.0"
17+
rust-version = "1.60.0"
1818

1919
[features]
2020
default = ["jlink-quirks"]

0 commit comments

Comments
 (0)