From aa20da4c7cbba937f80d2d318bfc93d3983f6247 Mon Sep 17 00:00:00 2001 From: Damien Voreiter Date: Tue, 17 Jun 2025 14:53:32 +0200 Subject: [PATCH 01/13] try fix clippy workflow --- .github/workflows/clippy.yml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index 3bca594..d32b06f 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -13,10 +13,20 @@ jobs: matrix: version: [community, enterprise] steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - - run: rustup component add clippy - - uses: actions-rs/clippy-check@v1 + - uses: doctolib/actions/checkout@main + + - name: Install rust + uses: dtolnay/rust-toolchain@888c2e1ea69ab0d4330cbf0af1ecc7b68f368cc1 # v1 with: - token: ${{ secrets.GITHUB_TOKEN }} - name: Clippy - args: --features=${{ matrix.version }} + toolchain: ${{ env.RUST_VERSION }} + targets: ${{ inputs.target }} + + - run: rustup component add clippy + + - name: Clippy check + shell: bash + run: | + set +e + # shellcheck disable=SC2046 + cargo clippy --color always --features=${{ matrix.version }} + exit "${PIPESTATUS[0]}" From 3399fa2cb2d4c40f1fe7f1b97fd5e487acb6fabf Mon Sep 17 00:00:00 2001 From: Damien Voreiter Date: Tue, 17 Jun 2025 14:54:44 +0200 Subject: [PATCH 02/13] weird --- .github/workflows/clippy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index d32b06f..66c4615 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -13,7 +13,7 @@ jobs: matrix: version: [community, enterprise] steps: - - uses: doctolib/actions/checkout@main + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - name: Install rust uses: dtolnay/rust-toolchain@888c2e1ea69ab0d4330cbf0af1ecc7b68f368cc1 # v1 From a1a0a41d98e88021cd45e2a69374168210486540 Mon Sep 17 00:00:00 2001 From: Damien Voreiter Date: Tue, 17 Jun 2025 14:58:02 +0200 Subject: [PATCH 03/13] better --- .github/workflows/clippy.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index 66c4615..37a1050 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -18,10 +18,8 @@ jobs: - name: Install rust uses: dtolnay/rust-toolchain@888c2e1ea69ab0d4330cbf0af1ecc7b68f368cc1 # v1 with: - toolchain: ${{ env.RUST_VERSION }} - targets: ${{ inputs.target }} - - - run: rustup component add clippy + toolchain: stable + components: clippy - name: Clippy check shell: bash From e1381172b4750d2c794cefbaf571bf40cc98d5cb Mon Sep 17 00:00:00 2001 From: Damien Voreiter Date: Tue, 17 Jun 2025 15:00:26 +0200 Subject: [PATCH 04/13] deps --- .github/workflows/clippy.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index 37a1050..1e4daad 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -15,6 +15,11 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 + - name: Install deps + run: | + sudo apt-get update -y + sudo apt-get install -y --no-install-recommends libpcsclite-dev libev-dev libevent-dev libpcsclite-dev pkg-config clang llvm + - name: Install rust uses: dtolnay/rust-toolchain@888c2e1ea69ab0d4330cbf0af1ecc7b68f368cc1 # v1 with: @@ -27,4 +32,3 @@ jobs: set +e # shellcheck disable=SC2046 cargo clippy --color always --features=${{ matrix.version }} - exit "${PIPESTATUS[0]}" From 9ff6b88506db5dc3eaf7289204d4d45c28ee0595 Mon Sep 17 00:00:00 2001 From: Damien Voreiter Date: Tue, 17 Jun 2025 15:03:37 +0200 Subject: [PATCH 05/13] add deps --- .github/workflows/clippy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index 1e4daad..d5a2066 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -18,7 +18,7 @@ jobs: - name: Install deps run: | sudo apt-get update -y - sudo apt-get install -y --no-install-recommends libpcsclite-dev libev-dev libevent-dev libpcsclite-dev pkg-config clang llvm + sudo apt-get install -y --no-install-recommends libpcsclite-dev libev-dev libevent-dev libpcsclite-dev pkg-config clang llvm llvm-dev libclang-dev - name: Install rust uses: dtolnay/rust-toolchain@888c2e1ea69ab0d4330cbf0af1ecc7b68f368cc1 # v1 From 2e171b54e402673c7d34fe72169a48fd36456493 Mon Sep 17 00:00:00 2001 From: Damien Voreiter Date: Tue, 17 Jun 2025 15:05:59 +0200 Subject: [PATCH 06/13] try without env --- .github/workflows/clippy.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index d5a2066..27c64f6 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -4,7 +4,6 @@ on: push env: CARGO_TERM_COLOR: always - LIBCLANG_PATH: /usr/lib/llvm-14/lib/ jobs: clippy_check: From a7a88620b36a7b7d63c571852a376faaf7cbc2f1 Mon Sep 17 00:00:00 2001 From: Damien Voreiter Date: Tue, 17 Jun 2025 15:08:51 +0200 Subject: [PATCH 07/13] fix clippy --- src/encryptable.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/encryptable.rs b/src/encryptable.rs index 12ea743..7dbc017 100644 --- a/src/encryptable.rs +++ b/src/encryptable.rs @@ -28,9 +28,9 @@ use crate::{ /// * The original key will be prefixed with 'encrypted$'. /// /// * The transformed Encryptable dictionary will contain `alg` property indicating -/// the encryption algorithm, `ciphertext` property whose value is a base-64 string of the -/// encrypted value, and optionally `kid` property indicating the encryption key identifier -/// if specified when returning the result of PropertyEncryptor callback call. +/// the encryption algorithm, `ciphertext` property whose value is a base-64 string of the +/// encrypted value, and optionally `kid` property indicating the encryption key identifier +/// if specified when returning the result of PropertyEncryptor callback call. /// /// For security reason, a document that contains Encryptable dictionaries will fail /// to push if their value cannot be encrypted including From 06ddfe2b8c086937171f698d8822538a29a5095a Mon Sep 17 00:00:00 2001 From: Damien Voreiter Date: Tue, 17 Jun 2025 15:38:08 +0200 Subject: [PATCH 08/13] try remove deps --- .github/workflows/clippy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index 27c64f6..fd3f7ff 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -17,7 +17,7 @@ jobs: - name: Install deps run: | sudo apt-get update -y - sudo apt-get install -y --no-install-recommends libpcsclite-dev libev-dev libevent-dev libpcsclite-dev pkg-config clang llvm llvm-dev libclang-dev + sudo apt-get install -y --no-install-recommends libev-dev libevent-dev pkg-config clang llvm llvm-dev libclang-dev - name: Install rust uses: dtolnay/rust-toolchain@888c2e1ea69ab0d4330cbf0af1ecc7b68f368cc1 # v1 From 66d3a93e88943822d56c39fd73adee71c4cf0c3b Mon Sep 17 00:00:00 2001 From: Damien Voreiter Date: Tue, 17 Jun 2025 15:39:30 +0200 Subject: [PATCH 09/13] try remove deps --- .github/workflows/clippy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index fd3f7ff..49d8d16 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -17,7 +17,7 @@ jobs: - name: Install deps run: | sudo apt-get update -y - sudo apt-get install -y --no-install-recommends libev-dev libevent-dev pkg-config clang llvm llvm-dev libclang-dev + sudo apt-get install -y --no-install-recommends pkg-config clang llvm llvm-dev libclang-dev - name: Install rust uses: dtolnay/rust-toolchain@888c2e1ea69ab0d4330cbf0af1ecc7b68f368cc1 # v1 From cc4310e2620133a67495dbde9c13cba40a4c3edf Mon Sep 17 00:00:00 2001 From: Damien Voreiter Date: Tue, 17 Jun 2025 15:45:28 +0200 Subject: [PATCH 10/13] try remove deps --- .github/workflows/clippy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index 49d8d16..4c95b01 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -17,7 +17,7 @@ jobs: - name: Install deps run: | sudo apt-get update -y - sudo apt-get install -y --no-install-recommends pkg-config clang llvm llvm-dev libclang-dev + sudo apt-get install -y --no-install-recommends clang llvm llvm-dev libclang-dev - name: Install rust uses: dtolnay/rust-toolchain@888c2e1ea69ab0d4330cbf0af1ecc7b68f368cc1 # v1 From 31967b130607d11902b6d95a43ac71b7ac24c97f Mon Sep 17 00:00:00 2001 From: Damien Voreiter Date: Tue, 17 Jun 2025 15:46:42 +0200 Subject: [PATCH 11/13] try remove deps --- .github/workflows/clippy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index 4c95b01..b2139d5 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -17,7 +17,7 @@ jobs: - name: Install deps run: | sudo apt-get update -y - sudo apt-get install -y --no-install-recommends clang llvm llvm-dev libclang-dev + sudo apt-get install -y --no-install-recommends llvm-dev libclang-dev - name: Install rust uses: dtolnay/rust-toolchain@888c2e1ea69ab0d4330cbf0af1ecc7b68f368cc1 # v1 From 8fc47631be8d016d13cb8c5b3a774248b6b689b3 Mon Sep 17 00:00:00 2001 From: Damien Voreiter Date: Tue, 17 Jun 2025 15:48:09 +0200 Subject: [PATCH 12/13] try remove deps --- .github/workflows/clippy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index b2139d5..4415d51 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -17,7 +17,7 @@ jobs: - name: Install deps run: | sudo apt-get update -y - sudo apt-get install -y --no-install-recommends llvm-dev libclang-dev + sudo apt-get install -y --no-install-recommends libclang-dev - name: Install rust uses: dtolnay/rust-toolchain@888c2e1ea69ab0d4330cbf0af1ecc7b68f368cc1 # v1 From e5311692af7f1f89da995b007a141473362852fc Mon Sep 17 00:00:00 2001 From: Damien Voreiter Date: Tue, 17 Jun 2025 15:51:02 +0200 Subject: [PATCH 13/13] ok --- .github/workflows/clippy.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index 4415d51..8941cc8 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -28,6 +28,5 @@ jobs: - name: Clippy check shell: bash run: | - set +e # shellcheck disable=SC2046 cargo clippy --color always --features=${{ matrix.version }}