diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1c13cbe..4c18b6e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - master + - main tags: - "*" pull_request: @@ -22,11 +22,10 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.81.0 + toolchain: 1.88.0 components: rustfmt, clippy override: true - # Verify rustc version - name: Check rustc version run: rustc --version @@ -39,11 +38,15 @@ jobs: target key: cargo-cache-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }} - - name: Format check - run: cargo fmt --all -- --check - - - name: Clippy (deny warnings) - run: cargo clippy --all-targets --all-features -- -D warnings - - - name: Run tests - run: cargo test --all --all-features --verbose + - name: Install cargo-deny (fast) + uses: taiki-e/install-action@v2 + with: + tool: cargo-deny + version: 0.18.5 + + - name: Run CI checks + run: | + cargo fmt --all -- --check + cargo clippy --all-targets --all-features -- -D warnings + cargo test --all --all-features --verbose + cargo deny check licenses bans sources diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml index e25bd6d..c99efc5 100644 --- a/.github/workflows/msrv.yml +++ b/.github/workflows/msrv.yml @@ -3,7 +3,7 @@ name: MSRV on: push: branches: - - master + - main tags: - "*" pull_request: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cca5aec..d7cb99a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,18 +41,12 @@ jobs: with: tool: cargo-deny - - name: Cache cargo-deny DB - uses: actions/cache@v4 - with: - path: ~/.cargo/advisory-db - key: cargo-deny-advisory-db-${{ hashFiles('**/Cargo.toml') }} - - name: Run CI checks run: | cargo fmt --all -- --check cargo clippy --all-targets --all-features -- -D warnings cargo test --all --all-features --verbose - cargo deny check licenses bans advisories sources + cargo deny check licenses bans sources - name: Publish to crates.io env: diff --git a/.github/workflows/sec.yml b/.github/workflows/sec.yml deleted file mode 100644 index 2694647..0000000 --- a/.github/workflows/sec.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: Security - -on: - push: - branches: - - master - tags: - - "*" - pull_request: - -jobs: - cargo-deny: - name: Cargo Deny - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - - name: Install cargo-deny (fast) - uses: taiki-e/install-action@v2 - with: - tool: cargo-deny - - - name: Cache advisory DB - uses: actions/cache@v4 - with: - path: ~/.cargo/advisory-db - key: advisory-db-v1 - - - name: Run cargo-deny - run: cargo deny check licenses bans advisories sources diff --git a/Cargo.toml b/Cargo.toml index 4d6ba4b..582343a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "rawsql" version = "0.2.0" +edition = "2021" authors = ["Manuel Alonso "] license = "MIT" description = "A rust library for reusing SQL" diff --git a/README.md b/README.md index 7344a13..a56d0a2 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ You can integrate rawsql into your project through the [releases on crates.io](h ```toml # Cargo.toml [dependencies] -rawsql = "0.1.1" +rawsql = "0.2.0" ``` ## Overview diff --git a/deny.toml b/deny.toml index 80f57c0..66f6770 100644 --- a/deny.toml +++ b/deny.toml @@ -9,5 +9,3 @@ allow = [ [sources] unknown-registry = "deny" unknown-git = "deny" - -[advisories]