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

Actually build MSRV in CI #24

Merged
merged 2 commits into from
Oct 4, 2024
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
13 changes: 0 additions & 13 deletions .github/bors.toml

This file was deleted.

6 changes: 4 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ jobs:
strategy:
matrix: # All permutations of {rust, mcu}
rust:
- 1.69.0 # MSRV
- 1.78.0 # MSRV
- stable
mcu:
- stm32h503
- stm32h562
- stm32h563
- stm32h573
env: # Peripheral Feature flags
FLAGS: rt
FLAGS: rt,log

steps:
- uses: actions/checkout@v4
Expand All @@ -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
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors = ["Edwin Svensson <[email protected]>"]
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"]
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<!-- [![Bors enabled](https://bors.tech/images/badge_small.svg)](https://app.bors.tech/repositories/12691) -->
[![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
Expand All @@ -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.

Expand Down
1 change: 0 additions & 1 deletion tools/verify-rust-version.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down