Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update ci & deprecate bors #225

Merged
merged 5 commits into from
Jun 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions .github/bors.toml

This file was deleted.

47 changes: 26 additions & 21 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,62 +1,67 @@
on:
push:
branches: [ staging, trying, master ]
branches: master
pull_request:
merge_group:

name: Continuous Integration

jobs:
ci:
name: CI
runs-on: ubuntu-latest
needs: [build, test, test-strict]
if: always()
steps:
- name: Done
run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'

# check if the project builds with MSRV, stable and nighly
build:
name: "Build (${{ matrix.name || matrix.rust }})"
runs-on: ubuntu-latest
continue-on-error: ${{ matrix.experimental || false }}
strategy:
matrix:
rust: [ 1.56.0, stable ]
rust: [ stable ]
include:
# Test nightly but don't fail the build.
- rust: nightly
experimental: true
# MSRV
- rust: 1.58.0
name: "MSRV"
steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Install Rust
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.rust }}
profile: minimal
override: true
- uses: actions-rs/cargo@v1
with:
command: check
components: clippy
- run: cargo check
env:
RUSTFLAGS: -D warnings
- run: cargo clippy
Comment on lines +41 to +45
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be fine imo since clippy doesn't add "error-by-default" lints just like that without reason, most new lints are added as warn or even allow


test:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Install Rust
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
profile: minimal
override: true
- uses: actions-rs/cargo@v1
with:
command: test
- run: cargo test

test-strict:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Install Rust
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
profile: minimal
override: true
- uses: actions-rs/cargo@v1
with:
command: test
args: --all-features
- run: cargo test --all-features
21 changes: 0 additions & 21 deletions .github/workflows/clippy.yml

This file was deleted.

12 changes: 4 additions & 8 deletions .github/workflows/rustfmt.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
on:
push:
branches: [ staging, trying, master ]
branches: master
pull_request:
merge_group:

name: Code formatting check

Expand All @@ -11,13 +12,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
- uses: dtolnay/rust-toolchain@master
with:
profile: minimal
toolchain: stable
override: true
components: rustfmt
- uses: actions-rs/cargo@v1
with:
command: fmt
args: --all -- --check
- run: cargo fmt --all -- --check
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ It consists of:

## Minimum Supported Rust Version (MSRV)

This crate is guaranteed to compile on stable Rust 1.56.0 and up. It *might*
This crate is guaranteed to compile on stable Rust 1.58.0 and up. It *might*
compile with older versions but that may change in any new patch release.

## License
Expand Down
2 changes: 1 addition & 1 deletion cmsis-svd
Submodule cmsis-svd updated from e5db23 to 9c416c
2 changes: 1 addition & 1 deletion svd-encoder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
name = "svd-encoder"
repository = "https://github.com/rust-embedded/svd"
edition = "2021"
rust-version = "1.56.0"
rust-version = "1.58.0"
version = "0.14.3"
readme = "README.md"

Expand Down
2 changes: 1 addition & 1 deletion svd-encoder/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This project is developed and maintained by the [Tools team][team].

## Minimum Supported Rust Version (MSRV)

This crate is guaranteed to compile on stable Rust 1.56.0 and up. It *might*
This crate is guaranteed to compile on stable Rust 1.58.0 and up. It *might*
compile with older versions but that may change in any new patch release.

## License
Expand Down
2 changes: 2 additions & 0 deletions svd-parser/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## Unreleased

- Bump MSRV to 1.58.0

## [v0.14.1] - 2022-10-23

- Update to `svd-rs` 0.14.1
Expand Down
2 changes: 1 addition & 1 deletion svd-parser/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 = "svd-parser"
repository = "https://github.com/rust-embedded/svd"
edition = "2021"
rust-version = "1.56.0"
rust-version = "1.58.0"
version = "0.14.1"
readme = "README.md"

Expand Down
2 changes: 1 addition & 1 deletion svd-parser/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This project is developed and maintained by the [Tools team][team].

## Minimum Supported Rust Version (MSRV)

This crate is guaranteed to compile on stable Rust 1.56.0 and up. It *might*
This crate is guaranteed to compile on stable Rust 1.58.0 and up. It *might*
compile with older versions but that may change in any new patch release.

## License
Expand Down
4 changes: 1 addition & 3 deletions svd-parser/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@
//! - [SVD Schema file](https://www.keil.com/pack/doc/CMSIS/SVD/html/schema_1_2_gr.html)
//! - [SVD file database](https://github.com/posborne/cmsis-svd/tree/master/data)
//! - [Sample SVD file](https://www.keil.com/pack/doc/CMSIS/SVD/html/svd_Example_pg.html)

#![deny(warnings)]

Comment on lines -22 to -24
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

replaced with RUSTFLAGS=-D warnings

//!
//! Parse traits.
//! These support parsing of SVD types from XML

Expand Down
6 changes: 4 additions & 2 deletions svd-rs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## Unreleased

- Bump MSRV to 1.58.0

## [v0.14.2] - 2023-04-04

- Add support of `a-Z` for `dimIndex`
- Add `name`, `description`, `address_offset` for `RegisterCluster`

## [v0.14.1] - 2022-10-23

- (De)serialize `dimIndex` (from)to string
- (De)serialize `dimIndex` (from)to string

## [v0.14.0] - 2022-07-19

Expand Down Expand Up @@ -63,7 +65,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
`header_struct_name` to `PeripheralInfo`, `alternate_cluster` to `ClusterInfo`
- Add `protection` to `RegisterProperties` and `AddressBlock`
- Add `readAction` to `RegisterInfo` and `FieldInfo`
- Add `single` and `array` for `Info` types,
- Add `single` and `array` for `Info` types,
`is_single` and `is_array` for `Peripheral`, `Cluster`, `Register` and `Field`
- Add array support for peripherals

Expand Down
2 changes: 1 addition & 1 deletion svd-rs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0"
name = "svd-rs"
repository = "https://github.com/rust-embedded/svd"
edition = "2021"
rust-version = "1.56.0"
rust-version = "1.58.0"
version = "0.14.2"
readme = "README.md"

Expand Down
2 changes: 1 addition & 1 deletion svd-rs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This project is developed and maintained by the [Tools team][team].

## Minimum Supported Rust Version (MSRV)

This crate is guaranteed to compile on stable Rust 1.56.0 and up. It *might*
This crate is guaranteed to compile on stable Rust 1.58.0 and up. It *might*
compile with older versions but that may change in any new patch release.

## License
Expand Down