Skip to content

Commit

Permalink
Switch to GHMQ and update
Browse files Browse the repository at this point in the history
  • Loading branch information
eldruin committed Sep 20, 2023
1 parent a0d986b commit 5a3989c
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 53 deletions.
8 changes: 0 additions & 8 deletions .github/bors.toml

This file was deleted.

39 changes: 17 additions & 22 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
on:
push:
branches: [ staging, trying, master ]
pull_request:
push: # Run CI for all branches except GitHub merge queue tmp branches
branches-ignore:
- "gh-readonly-queue/**"
pull_request: # Run CI for PRs on any branch
merge_group: # Run CI for the GitHub merge queue

name: Continuous integration

Expand All @@ -13,37 +15,30 @@ jobs:
strategy:
fail-fast: false
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, armv7-unknown-linux-gnueabihf]
target: [x86_64-unknown-linux-gnu, armv7-unknown-linux-gnueabihf]
features:
- ''
- 'async-tokio,gpio_cdev,gpio_sysfs,i2c,spi'

include:
# Test MSRV
- rust: 1.60.0
TARGET: x86_64-unknown-linux-gnu
- rust: 1.60.0 # MSRV
target: x86_64-unknown-linux-gnu

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

steps:
- uses: actions/checkout@v2

- uses: actions-rs/toolchain@v1
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
profile: minimal
toolchain: ${{ matrix.rust }}
target: ${{ matrix.TARGET }}
override: true
target: ${{ matrix.target }}

- name: Install armv7 libraries
if: ${{ matrix.TARGET == 'armv7-unknown-linux-gnueabihf' }}
if: ${{ matrix.target == 'armv7-unknown-linux-gnueabihf' }}
run: sudo apt-get install -y libc6-armhf-cross libc6-dev-armhf-cross gcc-arm-linux-gnueabihf

- uses: actions-rs/cargo@v1
with:
command: check
args: --target=${{ matrix.TARGET }}
- run: cargo check --target=${{ matrix.target }} --features=${{ matrix.features }}
18 changes: 8 additions & 10 deletions .github/workflows/clippy.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
on:
push:
branches: [ staging, trying, master ]
pull_request:
push: # Run CI for all branches except GitHub merge queue tmp branches
branches-ignore:
- "gh-readonly-queue/**"
pull_request: # Run CI for PRs on any branch
merge_group: # Run CI for the GitHub merge queue

name: Clippy check
jobs:
clippy_check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
profile: minimal
toolchain: stable
override: true
components: clippy
- uses: actions-rs/clippy-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
- run: cargo clippy --all-features -- --deny=warnings
22 changes: 9 additions & 13 deletions .github/workflows/rustfmt.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
on:
push:
branches: [ staging, trying, master ]
pull_request:
push: # Run CI for all branches except GitHub merge queue tmp branches
branches-ignore:
- "gh-readonly-queue/**"
pull_request: # Run CI for PRs on any branch
merge_group: # Run CI for the GitHub merge queue

name: Code formatting check

jobs:
fmt:
name: Rustfmt
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
profile: minimal
toolchain: stable
override: true
toolchain: nightly
components: rustfmt
- uses: actions-rs/cargo@v1
with:
command: fmt
args: --all -- --check
- run: cargo fmt --check

0 comments on commit 5a3989c

Please sign in to comment.