From 7a0c476cf61232e90b30b4c24241c7cd3b79cb3c Mon Sep 17 00:00:00 2001 From: Pierre Chifflier Date: Tue, 16 Sep 2025 16:07:26 +0200 Subject: [PATCH 1/6] Update README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a219316..f68f0c7 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -# ssh-parser - +![Maintenance](https://img.shields.io/badge/maintenance-activly--developed-brightgreen.svg) [![LICENSE](https://img.shields.io/badge/License-LGPL%20v2.1-blue.svg)](LICENSE) [![Build Status](https://github.com/rusticata/ssh-parser/actions/workflows/rust.yml/badge.svg)](https://github.com/rusticata/ssh-parser/actions/workflows/rust.yml) [![Crates.io Version](https://img.shields.io/crates/v/ssh-parser.svg)](https://crates.io/crates/ssh-parser) +# ssh-parser ## Overview From aa5d5770fef9aa4b2ac86d0201e4eeee9c53f770 Mon Sep 17 00:00:00 2001 From: Pierre Chifflier Date: Tue, 16 Sep 2025 16:07:44 +0200 Subject: [PATCH 2/6] Add configuration for prek/pre-commit --- .pre-commit-config.yaml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..36e1fb9 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,33 @@ +# See https://pre-commit.com for more information +# See https://pre-commit.com/hooks.html for more hooks +fail_fast: true + +exclude: | + (?x)^( + .*/(assets)/.*| + )$ + +repos: + - repo: 'https://github.com/pre-commit/pre-commit-hooks' + rev: v6.0.0 + hooks: + - id: trailing-whitespace + - id: end-of-file-fixer + - id: check-yaml + - id: check-added-large-files + + - repo: local + hooks: + - id: cargo-fmt + name: cargo fmt + entry: cargo fmt -- + language: system + types: [rust] + pass_filenames: false # This makes it a lot faster + + - id: cargo-clippy + name: cargo clippy + language: system + types: [rust] + pass_filenames: false + entry: cargo clippy --all-targets --all-features -- -D warnings From 0cdc2a10fce34e95168023049e975c36da2114a4 Mon Sep 17 00:00:00 2001 From: Pierre Chifflier Date: Tue, 16 Sep 2025 16:08:36 +0200 Subject: [PATCH 3/6] CI: update action checkout v4 -> v5 --- .github/workflows/rust.yml | 14 +++++++------- .github/workflows/security-audit.yml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 50c10d1..0d27e21 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -18,7 +18,7 @@ jobs: - 1.63.0 - nightly steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ matrix.rust }} @@ -37,7 +37,7 @@ jobs: - --features=serialize - --features=integers steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Install stable toolchain uses: dtolnay/rust-toolchain@stable - run: cargo test ${{ matrix.features }} @@ -46,7 +46,7 @@ jobs: name: Rustfmt runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: dtolnay/rust-toolchain@stable with: components: rustfmt @@ -56,7 +56,7 @@ jobs: name: Clippy runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: dtolnay/rust-toolchain@nightly with: components: clippy @@ -68,7 +68,7 @@ jobs: env: RUSTDOCFLAGS: --cfg docsrs steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: dtolnay/rust-toolchain@nightly - run: cargo doc --workspace --no-deps --all-features @@ -77,7 +77,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Check semver uses: obi1kenobi/cargo-semver-checks-action@v2 @@ -86,7 +86,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Install rust toolchain uses: dtolnay/rust-toolchain@master with: diff --git a/.github/workflows/security-audit.yml b/.github/workflows/security-audit.yml index c8e58c0..a4845b8 100644 --- a/.github/workflows/security-audit.yml +++ b/.github/workflows/security-audit.yml @@ -9,7 +9,7 @@ jobs: security_audit: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: rustsec/audit-check@v1 with: token: ${{ secrets.GITHUB_TOKEN }} From 1209e1cc7965bfca5ce9ff788c1d2a4e40173eb4 Mon Sep 17 00:00:00 2001 From: Pierre Chifflier Date: Tue, 16 Sep 2025 16:10:48 +0200 Subject: [PATCH 4/6] CI: use common action for cargo-check-external-types --- .github/workflows/rust.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 0d27e21..1c92dd6 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -87,10 +87,5 @@ jobs: steps: - name: Checkout sources uses: actions/checkout@v5 - - name: Install rust toolchain - uses: dtolnay/rust-toolchain@master - with: - toolchain: nightly-2025-08-06 - # ^ sync with https://github.com/awslabs/cargo-check-external-types/blob/main/rust-toolchain.toml - - run: cargo install cargo-check-external-types - - run: cargo check-external-types + - id: cargo-rdme + uses: rusticata/ci-action-check-external-types@v1 From 1861071d52cf78456a199a7108215d5df31870f5 Mon Sep 17 00:00:00 2001 From: Pierre Chifflier Date: Tue, 16 Sep 2025 16:12:22 +0200 Subject: [PATCH 5/6] CI: add CI job for prek/pre-commit checks (common action) --- .github/workflows/rust.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 1c92dd6..3de6615 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -8,6 +8,17 @@ on: - cron: '0 18 * * *' jobs: + pre_commit: + timeout-minutes: 5 + name: prek + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v5 + # tools used in pre-commit hooks + # /tools + - id: prek + uses: rusticata/ci-action-prek@v1 + check: name: Check runs-on: ubuntu-latest From b412b4e4c5a825b24ffc4af7448478329c58ecb2 Mon Sep 17 00:00:00 2001 From: Pierre Chifflier Date: Tue, 16 Sep 2025 16:13:38 +0200 Subject: [PATCH 6/6] CI: display toolchain version (cosmetic) --- .github/workflows/rust.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 3de6615..09d7fc6 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -30,7 +30,8 @@ jobs: - nightly steps: - uses: actions/checkout@v5 - - uses: dtolnay/rust-toolchain@master + - name: Install ${{ matrix.rust }} toolchain + uses: dtolnay/rust-toolchain@master with: toolchain: ${{ matrix.rust }} - name: Cargo update @@ -58,7 +59,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v5 - - uses: dtolnay/rust-toolchain@stable + - name: Install stable rustfmt + uses: dtolnay/rust-toolchain@stable with: components: rustfmt - run: cargo fmt --all -- --check @@ -68,7 +70,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v5 - - uses: dtolnay/rust-toolchain@nightly + - name: Install nightly clippy + uses: dtolnay/rust-toolchain@nightly with: components: clippy - run: cargo clippy -- -D warnings @@ -80,7 +83,8 @@ jobs: RUSTDOCFLAGS: --cfg docsrs steps: - uses: actions/checkout@v5 - - uses: dtolnay/rust-toolchain@nightly + - name: Install nightly rust + uses: dtolnay/rust-toolchain@nightly - run: cargo doc --workspace --no-deps --all-features semver: