Skip to content

Commit

Permalink
Updating CI
Browse files Browse the repository at this point in the history
  • Loading branch information
ryan-summers committed Jul 24, 2024
1 parent a0dad18 commit 6c6b39f
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 56 deletions.
38 changes: 26 additions & 12 deletions .github/workflows/ci.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:
branches: [ master ]

name: Continuous integration

Expand Down Expand Up @@ -30,19 +31,32 @@ jobs:
TARGET: x86_64-unknown-linux-gnu

steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
- uses: actions/checkout@v4

- uses: dtolnay/rust-toolchain@stable
with:
profile: minimal
toolchain: ${{ matrix.rust }}
target: ${{ matrix.TARGET }}
override: true
- uses: actions-rs/cargo@v1
with:
command: build
args: --target=${{ matrix.TARGET }}
- uses: actions-rs/cargo@v1

- run: cargo build --target=${{ matrix.TARGET }}

- run: cargo test --target=${{ matrix.TARGET }} --all-features
if: ${{ contains(matrix.TARGET, 'x86_64') }}

clippy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
with:
command: test
args: --target=${{ matrix.TARGET }} --all-features
components: clippy

- run: cargo clippy

fmt:
name: Rustfmt
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- run: cargo fmt --all -- --check
20 changes: 0 additions & 20 deletions .github/workflows/clippy.yml

This file was deleted.

23 changes: 0 additions & 23 deletions .github/workflows/rustfmt.yml

This file was deleted.

1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Support for optional package `defmt` which allows for easy conversion for
error types when using tools like `probe-rs` for logging over debuggers.
- Implement `Serializer::collect_str`
- Derive `Serialize` for `de::Error` and `ser::Error`

### Changed

Expand Down
2 changes: 1 addition & 1 deletion src/ser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ use core::mem::MaybeUninit;
use core::{fmt, str};

use serde::ser;
use serde::Serialize;
use serde::ser::SerializeStruct as _;
use serde::Serialize;

#[cfg(feature = "heapless")]
use heapless::{String, Vec};
Expand Down

0 comments on commit 6c6b39f

Please sign in to comment.