diff --git a/.github/bors.toml b/.github/bors.toml deleted file mode 100644 index ae7a9a9..0000000 --- a/.github/bors.toml +++ /dev/null @@ -1,13 +0,0 @@ -block_labels = ["wip"] -delete_merged_branches = true -status = [ - "Rustfmt", - "ci (1.69.0, stm32h503)", - "ci (1.69.0, stm32h562)", - "ci (1.69.0, stm32h563)", - "ci (1.69.0, stm32h573)", - "ci (stable, stm32h503)", - "ci (stable, stm32h562)", - "ci (stable, stm32h563)", - "ci (stable, stm32h573)", -] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 63cfc57..2fb8ee1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: # All permutations of {rust, mcu} rust: - - 1.69.0 # MSRV + - 1.78.0 # MSRV - stable mcu: - stm32h503 @@ -19,7 +19,7 @@ jobs: - stm32h563 - stm32h573 env: # Peripheral Feature flags - FLAGS: rt + FLAGS: rt,log steps: - uses: actions/checkout@v4 @@ -35,6 +35,8 @@ jobs: with: path: target key: ${{ runner.os }}-target-${{ matrix.rust }}-${{ hashFiles('**/Cargo.toml') }}-memory-${{ hashFiles('**/*.x') }} + - name: Set rust version + run: rustup override set ${{ matrix.rust }} - name: Install thumbv8m rust target run: rustup target add thumbv8m.main-none-eabihf - name: Build diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index eac72d9..ae963b2 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -14,12 +14,11 @@ jobs: matrix: mcu: - stm32h503 - logging: # Example logging options - - log-itm - - log-semihost - - log-rtt + - stm32h562 + - stm32h563 + - stm32h573 env: # Peripheral Feature flags - FLAGS: rt + FLAGS: rt,log steps: - uses: actions/checkout@v4 @@ -40,6 +39,6 @@ jobs: - name: Install thumbv8m rust target run: rustup +nightly target add thumbv8m.main-none-eabihf - name: Build - run: cargo +nightly build --verbose --release --examples --target thumbv8m.main-none-eabihf --features ${{ matrix.mcu }},${{ env.FLAGS }},${{ matrix.logging }} + run: cargo +nightly build --verbose --release --examples --target thumbv8m.main-none-eabihf --features ${{ matrix.mcu }},${{ env.FLAGS }} - name: Test run: cargo +nightly test --lib --target x86_64-unknown-linux-gnu --features ${{ matrix.mcu }},${{ env.FLAGS }} diff --git a/Cargo.toml b/Cargo.toml index 5614dc7..5e41f65 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Edwin Svensson "] homepage = "https://github.com/stm32-rs/stm32h5xx-hal" repository = "https://github.com/stm32-rs/stm32h5xx-hal" readme = "README.md" -rust-version = "1.69.0" +rust-version = "1.78.0" categories = ["embedded", "hardware-support", "no-std"] description = "Hardware Abstraction Layer implementation for STM32H5 series microcontrollers" keywords = ["arm", "cortex-m", "stm32h5xx", "hal", "embedded-hal"] diff --git a/README.md b/README.md index 5e928b3..92926ec 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![CI](https://github.com/stm32-rs/stm32h5xx-hal/workflows/Continuous%20integration/badge.svg)](https://github.com/stm32-rs/stm32h5xx-hal/actions) [![Crates.io](https://img.shields.io/crates/v/stm32h5xx-hal.svg)](https://crates.io/crates/stm32h5xx-hal) -![Minimum rustc version](https://img.shields.io/badge/rustc-1.69.0+-yellow.svg) +![Minimum rustc version](https://img.shields.io/badge/rustc-1.78.0+-yellow.svg) [_stm32h5xx-hal_](https://github.com/stm32-rs/stm32h5xx-hal) contains a hardware abstraction layer on top of the peripheral access API for @@ -29,7 +29,7 @@ every single model. ### Minimum supported Rust version -The Minimum Supported Rust Version (MSRV) at the moment is **1.69.0**. Older +The Minimum Supported Rust Version (MSRV) at the moment is **1.78.0**. Older versions **may** compile, especially when some features are not used in your application. diff --git a/tools/verify-rust-version.js b/tools/verify-rust-version.js index 09e2550..0d6cf66 100644 --- a/tools/verify-rust-version.js +++ b/tools/verify-rust-version.js @@ -7,7 +7,6 @@ const re2 = /(1\.[0-9]{2}\.[0-9]{1})/g; const cargo_toml = 'Cargo.toml'; const files = [ 'README.md', - '.github/bors.toml', '.github/workflows/ci.yml', '.github/workflows/clippy.yml', '.github/workflows/nightly.yml',