Skip to content

Commit

Permalink
Update minimum version and cleanup CI (#58)
Browse files Browse the repository at this point in the history
  • Loading branch information
Jake-Shadle authored Dec 20, 2022
1 parent b8fde1f commit 8f2a81e
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 22 deletions.
36 changes: 15 additions & 21 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,41 +12,38 @@ name: CI
jobs:
lint:
name: Lint
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: "1.56.1"
override: true
toolchain: "1.65.0"
components: "rustfmt,clippy"

# make sure all code has been formatted with rustfmt
- run: rustup component add rustfmt
- name: check rustfmt
run: cargo fmt -- --check --color always

# run clippy to verify we have no warnings
- run: rustup component add clippy
- run: cargo fetch
- name: cargo clippy
- name: clippy
run: cargo clippy --all-targets --all-features -- -D warnings

deny-check:
name: cargo-deny check
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: EmbarkStudios/cargo-deny-action@v1

msrv-check:
name: Minimum Stable Rust Version Check
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: "1.56.1"
override: true
toolchain: "1.65.0"
- run: cargo fetch
- name: cargo check
run: cargo check --all-targets --all-features
Expand All @@ -55,14 +52,11 @@ jobs:
name: Test
strategy:
matrix:
os: [ubuntu-20.04, macos-11]
os: [ubuntu-22.04]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
- run: cargo fetch
- name: cargo build
run: cargo build --tests --all-features
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ authors = [
]
description = "Helper crate for SDPX expressions"
edition = "2021"
rust-version = "1.56.1"
rust-version = "1.65.0"
homepage = "https://github.com/EmbarkStudios/spdx"
documentation = "https://docs.rs/spdx"
readme = "README.md"
Expand Down

0 comments on commit 8f2a81e

Please sign in to comment.