Update CI

Author: Kijewski

.github/actions/setup-rust/action.yaml

@@ -10,53 +10,50 @@ on:
 
 jobs:
   fmt:
+    strategy:
+      matrix:
+        toolchain:
+          - nightly
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-
-      - name: Setup Rust
-        uses: ./.github/actions/setup-rust
+      - uses: dtolnay/rust-toolchain@master
         with:
-          key: fmt
-          toolchain: nightly
+          toolchain: ${{ matrix.toolchain }}
           components: rustfmt
-
       - run: cargo fmt --all -- --check
 
   clippy:
     strategy:
       matrix:
         toolchain:
-          - stable
+          - nightly
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-
-      - name: Setup Rust
-        uses: ./.github/actions/setup-rust
+      - uses: dtolnay/rust-toolchain@master
         with:
-          key: clippy
           toolchain: ${{ matrix.toolchain }}
           components: clippy
-
       - run: cargo clippy --workspace --all-targets -- -D warnings
 
   check:
     strategy:
       matrix:
         toolchain:
-          - stable
+          - "1.81"
+        package:
+          - "zipsign"
+        include:
+          - toolchain: "1.73"
+            package: zipsign-api
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-
-      - name: Setup Rust
-        uses: ./.github/actions/setup-rust
+      - uses: dtolnay/rust-toolchain@master
         with:
-          key: check
           toolchain: ${{ matrix.toolchain }}
-
-      - run: cargo check --workspace --all-targets
+      - run: cargo check --package ${{ matrix.package }} --all-targets
 
   test:
     strategy:
@@ -66,20 +63,16 @@ jobs:
         os:
           - ubuntu-22.04
           - windows-2022
-          - macos-12
+          - macos-13
         versions:
           - ""
           - "-Zminimal-versions"
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-
-      - name: Setup Rust
-        uses: ./.github/actions/setup-rust
+      - uses: dtolnay/rust-toolchain@master
         with:
-          key: test${{ matrix.versions }}
           toolchain: ${{ matrix.toolchain }}
-          components: clippy
 
       - name: Update lockfile
         run: cargo generate-lockfile ${{ matrix.versions }}
@@ -89,55 +82,41 @@ jobs:
       - run: cargo test --workspace --all-targets
 
   doc:
+    strategy:
+      matrix:
+        toolchain:
+          - nightly
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-
-      - name: Setup Rust
-        uses: ./.github/actions/setup-rust
+      - uses: dtolnay/rust-toolchain@master
         with:
-          key: doc
-          toolchain: nightly
-
-      - run: cargo +nightly doc --all-features --no-deps
+          toolchain: ${{ matrix.toolchain }}
+      - run: cargo doc --workspace --all-features --no-deps
         env:
-          RUSTDOCFLAGS: "--cfg docsrs -D warnings"
+          RUSTDOCFLAGS: -Z unstable-options --generate-link-to-definition --cfg=docsrs -D warnings
 
   audit:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-
-      - name: Setup Rust
-        uses: ./.github/actions/setup-rust
-        with:
-          key: audit
-          toolchain: stable
-
-      - name: Install cargo-audit
-        uses: taiki-e/install-action@v2
-        with:
-          tool: cargo-audit
-
-      - name: Run audit
-        run: cargo audit --deny warnings
+      - uses: EmbarkStudios/cargo-deny-action@v2
 
   api-powerset:
+    strategy:
+      matrix:
+        toolchain:
+          - 1.73
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-
-      - name: Setup Rust
-        uses: ./.github/actions/setup-rust
+      - uses: dtolnay/rust-toolchain@master
         with:
-          key: api-powerset
-          toolchain: stable
-
+          toolchain: ${{ matrix.toolchain }}
       - name: Install cargo-hack
         uses: taiki-e/install-action@v2
         with:
           tool: cargo-hack
-
       - name: Check powerset
         run: cargo hack check --feature-powerset --package zipsign-api
         env:
@@ -151,18 +130,16 @@ jobs:
         os:
           - ubuntu-22.04
           - windows-2022
-          - macos-12
+          - macos-13
         versions:
           - ""
           - "-Zminimal-versions"
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup Rust
-        uses: ./.github/actions/setup-rust
+      - uses: dtolnay/rust-toolchain@master
         with:
-          key: execute${{ matrix.versions }}
           toolchain: ${{ matrix.toolchain }}
 
       - name: Update lockfile
@@ -187,15 +164,17 @@ jobs:
           zipsign unsign zip Cargo.lock.zip
 
   semver-checks:
+    strategy:
+      matrix:
+        toolchain:
+          - stable
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup Rust
-        uses: ./.github/actions/setup-rust
+      - uses: dtolnay/rust-toolchain@master
         with:
-          key: semver-checks
-          toolchain: stable
+          toolchain: ${{ matrix.toolchain }}
 
       - name: Install cargo-semver-checks
         uses: taiki-e/install-action@v2
@@ -207,20 +186,44 @@ jobs:
       - run: cargo semver-checks -p zipsign-api --all-features
 
   public-api:
+    strategy:
+      matrix:
+        toolchain:
+          - nightly
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup Rust
-        uses: ./.github/actions/setup-rust
+      - uses: dtolnay/rust-toolchain@master
         with:
-          key: public-api
-          toolchain: nightly
+          toolchain: ${{ matrix.toolchain }}
 
       - name: Install cargo-public-api
         uses: taiki-e/install-action@v2
         with:
           tool: cargo-public-api
 
       - run: cargo public-api -p zipsign-api
+        working-directory: api
       - run: cargo public-api -p zipsign-api diff
+        working-directory: api
+
+  sort:
+    name: Check order in Cargo.toml
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+
+      - run: cargo install --git https://github.com/DevinR528/cargo-sort.git --rev 3701753667c5d47ae166d6e5cd7a11384e068ed0
+
+      - run: cargo sort --workspace --grouped --check --check-format
+
+  typos:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: crate-ci/typos@master

.github/workflows/ci.yml

@@ -6,6 +6,21 @@ edition = "2021"
 authors = ["René Kijewski <[email protected]>"]
 repository = "https://github.com/Kijewski/zipsign"
 license = "Apache-2.0 WITH LLVM-exception"
+rust-version = "1.81"
+
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--generate-link-to-definition", "--cfg=docsrs"]
+
+[dependencies]
+clap.workspace = true
+ed25519-dalek = { workspace = true, features = ["rand_core"] }
+normalize-path.workspace = true
+pretty-error-debug.workspace = true
+rand_core.workspace = true
+tempfile.workspace = true
+thiserror.workspace = true
+zipsign-api.workspace = true
 
 [workspace]
 resolver = "2"
@@ -28,17 +43,3 @@ version = "0.1.2"
 path = "api"
 default-features = false
 features = ["tar", "zip"]
-
-[dependencies]
-clap.workspace = true
-ed25519-dalek = { workspace = true, features = ["rand_core"] }
-normalize-path.workspace = true
-pretty-error-debug.workspace = true
-rand_core.workspace = true
-tempfile.workspace = true
-thiserror.workspace = true
-zipsign-api.workspace = true
-
-[package.metadata.docs.rs]
-all-features = true
-rustdoc-args = ["--cfg", "docsrs"]

Cargo.toml

@@ -0,0 +1,5 @@
+[default]
+locale = "en-us"
+
+[files]
+extend-exclude = ["/.*"]

_typos.toml

@@ -6,6 +6,11 @@ edition = "2021"
 authors = ["René Kijewski <[email protected]>"]
 repository = "https://github.com/Kijewski/zipsign"
 license = "Apache-2.0 WITH LLVM-exception"
+rust-version = "1.73"
+
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--generate-link-to-definition", "--cfg=docsrs"]
 
 [dependencies]
 base64 = { workspace = true, optional = true }
@@ -27,7 +32,3 @@ sign-zip = ["dep:zip"]
 
 tar = ["sign-tar", "unsign-tar", "verify-tar"]
 zip = ["sign-zip", "unsign-zip", "verify-zip"]
-
-[package.metadata.docs.rs]
-all-features = true
-rustdoc-args = ["--cfg", "docsrs"]

api/Cargo.toml

@@ -1,7 +1,7 @@
 // "\x0c\x04\x01" -- form feed, end of text, start of header
 // "ed25519ph" -- used algorithm
 // "\x00\x00" -- version number in network byte order
-/// Bytes preceeding signatures
+/// Bytes preceding signatures
 pub(crate) const MAGIC_HEADER: &[u8; 14] = b"\x0c\x04\x01ed25519ph\x00\x00";
 
 /// Total number of bytes in a [`MAGIC_HEADER`] + [`SignatureCountLeInt`]

api/src/constants.rs

@@ -1,4 +1,4 @@
-#![cfg_attr(docsrs, feature(doc_cfg))]
+#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 #![forbid(unsafe_code)]
 #![allow(unknown_lints)]
 #![warn(absolute_paths_not_starting_with_crate)]
@@ -108,7 +108,7 @@ pub enum ZipsignError {
     #[cfg(feature = "verify-tar")]
     #[cfg_attr(docsrs, doc(cfg(feature = "verify-tar")))]
     VerifyTar(#[from] self::verify::VerifyTarError),
-    /// An error retuned by [`verify_zip()`][self::verify::verify_zip]
+    /// An error returned by [`verify_zip()`][self::verify::verify_zip]
     #[cfg(feature = "verify-zip")]
     #[cfg_attr(docsrs, doc(cfg(feature = "verify-zip")))]
     VerifyZip(#[from] self::verify::VerifyZipError),

api/src/lib.rs

@@ -6,7 +6,7 @@ use super::{NoMatch, ReadSignaturesError, VerifyingKey, find_match, read_signatu
 use crate::{Prehash, Signature};
 
 crate::Error! {
-    /// An error retuned by [`verify_zip()`]
+    /// An error returned by [`verify_zip()`]
     pub struct VerifyZipError(Error) {
         #[error("could not read input")]
         InputRead(#[source] std::io::Error),