Skip to content

Commit

Permalink
Merge #272
Browse files Browse the repository at this point in the history
272: [v0.2.x] GHA CI r=ryankurte a=eldruin

Backport moving CI to GHA

Co-authored-by: Diego Barrios Romero <eldruin@gmail.com>
  • Loading branch information
bors[bot] and eldruin committed Apr 28, 2021
2 parents 384b493 + 4df0da2 commit 6d360d6
Show file tree
Hide file tree
Showing 20 changed files with 236 additions and 187 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @rust-embedded/hal @ilya-epifanov @thejpster
* @rust-embedded/hal
8 changes: 7 additions & 1 deletion .github/bors.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
block_labels = ["needs-decision"]
delete_merged_branches = true
required_approvals = 1
status = ["continuous-integration/travis-ci/push"]
status = [
"ci-linux (stable, x86_64-unknown-linux-gnu)",
"ci-linux (stable, thumbv6m-none-eabi)",
"ci-linux (stable, thumbv7m-none-eabi)",
"ci-linux (1.31.0, x86_64-unknown-linux-gnu)",
"fmt",
]
48 changes: 48 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
on:
push:
branches: [ staging, trying, master ]
pull_request:

name: Continuous integration

env:
RUSTFLAGS: '--deny warnings'

jobs:
ci-linux:
runs-on: ubuntu-latest
strategy:
matrix:
# All generated code should be running on stable now
rust: [stable]

# The default target we're compiling on and for
TARGET: [x86_64-unknown-linux-gnu, thumbv6m-none-eabi, thumbv7m-none-eabi]

include:
- rust: 1.31.0
TARGET: x86_64-unknown-linux-gnu

# Test nightly but don't fail
- rust: nightly
experimental: true
TARGET: x86_64-unknown-linux-gnu

steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: ${{ matrix.rust }}
target: ${{ matrix.TARGET }}
override: true
- uses: actions-rs/cargo@v1
with:
command: check
args: --target=${{ matrix.TARGET }}

- uses: actions-rs/cargo@v1
with:
command: check
args: --target=${{ matrix.TARGET }} --features unproven

20 changes: 20 additions & 0 deletions .github/workflows/clippy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
on:
push:
branches: [ staging, trying, master ]
pull_request:

name: Clippy check
jobs:
clippy_check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
override: true
components: clippy
- uses: actions-rs/clippy-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
22 changes: 22 additions & 0 deletions .github/workflows/rustfmt.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
on:
push:
branches: [ staging, trying, master ]
pull_request:

name: Code formatting check

jobs:
fmt:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
override: true
components: rustfmt
- uses: actions-rs/cargo@v1
with:
command: fmt
args: --all -- --check
29 changes: 29 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
on:
push:
branches: [ staging, trying, master ]
pull_request:

name: Test Suite

env:
RUSTFLAGS: '--deny warnings'

jobs:
ci-linux:
runs-on: ubuntu-latest
strategy:
matrix:
rust: [nightly]

steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: ${{ matrix.rust }}
target: ${{ matrix.TARGET }}
override: true
- uses: actions-rs/cargo@v1
with:
command: test
args: --features unproven
50 changes: 0 additions & 50 deletions .travis.yml

This file was deleted.

20 changes: 0 additions & 20 deletions ci/after_success.sh

This file was deleted.

9 changes: 0 additions & 9 deletions ci/install.sh

This file was deleted.

12 changes: 0 additions & 12 deletions ci/script.sh

This file was deleted.

2 changes: 1 addition & 1 deletion src/blocking/i2c.rs
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,6 @@ pub trait WriteIterRead {
bytes: B,
buffer: &mut [u8],
) -> Result<(), Self::Error>
where
where
B: IntoIterator<Item = u8>;
}
10 changes: 6 additions & 4 deletions src/digital/mod.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
//! Digital I/O
//!
//!
//!
//!

// Deprecated / infallible traits
#[deprecated(since = "0.2.2", note = "Deprecated because the methods cannot return errors. \
Users should use the traits in digital::v2.")]
#[deprecated(
since = "0.2.2",
note = "Deprecated because the methods cannot return errors. \
Users should use the traits in digital::v2."
)]
pub mod v1;

// New / fallible traits
Expand All @@ -22,4 +25,3 @@ pub mod v2_compat;
// Re-export old traits so this isn't a breaking change
#[allow(deprecated)]
pub use self::v1::*;

0 comments on commit 6d360d6

Please sign in to comment.