Skip to content

Commit

Permalink
Merge #270
Browse files Browse the repository at this point in the history
270: Prepare for release of new versions of cortex-m-semihosting and panic-semihosting r=therealprof a=adamgreig

For the next step in #263 (review), this PR increases the version number for panic-semihosting and cortex-m-semihosting. For c-m-sh this is a breaking change to include #269.

Both projects seem to build just fine with cortex-m master, so I anticipate they should work fine with the to-be-released 0.7, hence increasing the acceptable cortex-m version range.

The CHANGELOG links are a bit troublesome, so I've added new tags to this repo `c-m-sh-v0.3.5` and `p-sh-v0.5.3` which point to the merge commit, and I'll tag new `c-m-sh-v0.4.0` and `p-sh-v0.5.4` after this is merged.

Co-authored-by: Adam Greig <adam@adamgreig.com>
  • Loading branch information
bors[bot] and adamgreig authored Oct 14, 2020
2 parents 55d67fa + 81ab508 commit a6be560
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 7 deletions.
7 changes: 6 additions & 1 deletion cortex-m-semihosting/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [v0.4.0] - 2020-10-14

- Moved into cortex-m repository
- Merge `HStdout` and `HStderr` into one type: `HostStream`
- Support cortex-m v0.7

## [v0.3.5] - 2019-08-29

Expand Down Expand Up @@ -111,7 +115,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).

- Initial release

[Unreleased]: https://github.com/rust-embedded/cortex-m-semihosting/compare/v0.3.5...HEAD
[Unreleased]: https://github.com/rust-embedded/cortex-m/compare/c-m-sh-v0.4.0...HEAD
[v0.4.0]: https://github.com/rust-embedded/cortex-m/compare/c-m-sh-v0.3.5...c-m-sh-v0.4.0
[v0.3.5]: https://github.com/rust-embedded/cortex-m-semihosting/compare/v0.3.4...v0.3.5
[v0.3.4]: https://github.com/rust-embedded/cortex-m-semihosting/compare/v0.3.3...v0.3.4
[v0.3.3]: https://github.com/rust-embedded/cortex-m-semihosting/compare/v0.3.2...v0.3.3
Expand Down
4 changes: 2 additions & 2 deletions cortex-m-semihosting/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0"
name = "cortex-m-semihosting"
readme = "README.md"
repository = "https://github.com/rust-embedded/cortex-m"
version = "0.3.5"
version = "0.4.0"
edition = "2018"

[features]
Expand All @@ -19,4 +19,4 @@ jlink-quirks = []
no-semihosting = []

[dependencies]
cortex-m = { path = "..", version = ">= 0.5.8, < 0.7" }
cortex-m = { path = "..", version = ">= 0.5.8, < 0.8" }
8 changes: 7 additions & 1 deletion panic-semihosting/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [v0.5.4] - 2020-10-14

- Moved into cortex-m repository
- Support cortex-m v0.7, cortex-m-semihosting v0.4

## [v0.5.3] - 2019-09-01

- Added feature `jlink-quirks` to work with JLink
Expand Down Expand Up @@ -56,7 +61,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

Initial release

[Unreleased]: https://github.com/rust-embedded/panic-semihosting/compare/v0.5.3...HEAD
[Unreleased]: https://github.com/rust-embedded/panic-semihosting/compare/p-sh-v0.5.4...HEAD
[v0.5.4]: https://github.com/rust-embedded/cortex-m/compare/p-sh-v0.5.3...p-sh-v0.5.4
[v0.5.3]: https://github.com/rust-embedded/panic-semihosting/compare/v0.5.2...v0.5.3
[v0.5.2]: https://github.com/rust-embedded/panic-semihosting/compare/v0.5.1...v0.5.2
[v0.5.1]: https://github.com/rust-embedded/panic-semihosting/compare/v0.5.0...v0.5.1
Expand Down
6 changes: 3 additions & 3 deletions panic-semihosting/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ keywords = ["panic-handler", "panic-impl", "panic", "semihosting"]
license = "MIT OR Apache-2.0"
name = "panic-semihosting"
repository = "https://github.com/rust-embedded/cortex-m"
version = "0.5.3"
version = "0.5.4"

[dependencies]
cortex-m = { path = "..", version = ">= 0.5.6, < 0.7" }
cortex-m-semihosting = { path = "../cortex-m-semihosting", version = "0.3" }
cortex-m = { path = "..", version = ">= 0.5.6, < 0.8" }
cortex-m-semihosting = { path = "../cortex-m-semihosting", version = ">= 0.3, < 0.5" }

[features]
exit = []
Expand Down

0 comments on commit a6be560

Please sign in to comment.