From d6d800c6d1f7356397c8465ccf4fafc101f30e6e Mon Sep 17 00:00:00 2001 From: Ed Page Date: Tue, 15 Feb 2022 13:31:29 -0600 Subject: [PATCH] chore: Upgrade boilerplate --- .clippy.toml | 1 + .github/workflows/ci.yml | 30 +++++------------------------- .github/workflows/committed.yml | 2 ++ .github/workflows/rust-next.yml | 2 ++ .gitignore | 2 +- release.toml | 1 - 6 files changed, 11 insertions(+), 27 deletions(-) create mode 100644 .clippy.toml diff --git a/.clippy.toml b/.clippy.toml new file mode 100644 index 0000000..fc3ef79 --- /dev/null +++ b/.clippy.toml @@ -0,0 +1 @@ +msrv = "1.54.0" # MSRV diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f1e32e9..c3c49ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,33 +19,13 @@ on: jobs: ci: name: CI - needs: [smoke, test, msrv, docs, rustfmt, clippy] + needs: [test, msrv, docs, rustfmt, clippy] runs-on: ubuntu-latest steps: - name: Done run: exit 0 - smoke: - name: Quick Check - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - name: Install Rust - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - profile: minimal - override: true - - uses: Swatinem/rust-cache@v1 - - name: Default features - run: cargo check --workspace --all-targets - - name: All features - run: cargo check --workspace --all-targets --all-features - - name: No-default features - run: cargo check --workspace --all-targets --no-default-features test: name: Test - needs: smoke strategy: matrix: os: ["ubuntu-latest", "windows-latest", "macos-latest"] @@ -62,6 +42,8 @@ jobs: profile: minimal override: true - uses: Swatinem/rust-cache@v1 + - name: Build + run: cargo test --no-run --workspace --all-features - name: Default features run: cargo test --workspace - name: All features @@ -70,7 +52,6 @@ jobs: run: cargo test --workspace --no-default-features msrv: name: "Check MSRV: 1.54.0" - needs: smoke runs-on: ubuntu-latest steps: - name: Checkout repository @@ -90,7 +71,6 @@ jobs: run: cargo check --workspace --all-targets --no-default-features docs: name: Docs - needs: smoke runs-on: ubuntu-latest steps: - name: Checkout repository @@ -105,7 +85,7 @@ jobs: - name: Check documentation env: RUSTDOCFLAGS: -D warnings - run: cargo doc --no-deps --document-private-items --workspace + run: cargo doc --workspace --all-features --no-deps --document-private-items rustfmt: name: rustfmt runs-on: ubuntu-latest @@ -141,4 +121,4 @@ jobs: - uses: actions-rs/clippy-check@v1 with: token: ${{ secrets.GITHUB_TOKEN }} - args: --workspace --all-features --all-targets -- -D warnings + args: --workspace --all-features --all-targets -- -D warnings --allow deprecated diff --git a/.github/workflows/committed.yml b/.github/workflows/committed.yml index b6433d3..8375557 100644 --- a/.github/workflows/committed.yml +++ b/.github/workflows/committed.yml @@ -1,3 +1,5 @@ +# Not run as part of pre-commit checks because they don't handle sending the correct commit +# range to `committed` name: Lint Commits on: [pull_request] diff --git a/.github/workflows/rust-next.yml b/.github/workflows/rust-next.yml index bce29d1..109429b 100644 --- a/.github/workflows/rust-next.yml +++ b/.github/workflows/rust-next.yml @@ -24,6 +24,8 @@ jobs: profile: minimal override: true - uses: Swatinem/rust-cache@v1 + - name: Build + run: cargo test --no-run --workspace --all-features - name: Default features run: cargo test --workspace - name: All features diff --git a/.gitignore b/.gitignore index ea8c4bf..eb5a316 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/target +target diff --git a/release.toml b/release.toml index 1f7506b..43b60c1 100644 --- a/release.toml +++ b/release.toml @@ -1,5 +1,4 @@ pre-release-commit-message = "chore: Release" -dev-version = false tag-message = "{{tag_name}}" tag-name = "{{prefix}}v{{version}}" consolidate-commits = true