]> Untitled Git - bdk/commitdiff
[ci] misc fixes
authorDaniela Brozzoni <danielabrozzoni@protonmail.com>
Fri, 10 Mar 2023 12:10:16 +0000 (13:10 +0100)
committerLLFourn <lloyd.fourn@gmail.com>
Mon, 13 Mar 2023 03:32:13 +0000 (14:32 +1100)
LLFourn is squashing these to get them all signed:

Remove useless clippy allow

ci: use clippy action

[ci] remove check for features=default

.github/workflows/cont_integration.yml
crates/bdk/src/wallet/mod.rs

index a90d74667d477c5642e745bb9540c6496dbbaf95..128ba7251f452e12130026037465484ee895e737 100644 (file)
@@ -10,32 +10,25 @@ jobs:
     strategy:
       matrix:
         rust:
-          - version: 1.67.0 # STABLE
+          - version: stable
             clippy: true
           - version: 1.57.0 # MSRV
         features:
           - --no-default-features
           - --all-features
-          - --features=default
     steps:
       - name: checkout
         uses: actions/checkout@v2
-      - name: Generate cache key
-        run: echo "${{ matrix.rust.version }} ${{ matrix.features }}" | tee .cache_key
       - name: Install Rust toolchain
         uses: actions-rs/toolchain@v1
         with:
             toolchain: ${{ matrix.rust.version }}
             override: true
-            components: clippy
             profile: minimal
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2.2.1
       - name: Build
         run: cargo build ${{ matrix.features }}
-      - name: Clippy
-        if: ${{ matrix.rust.clippy }}
-        run: cargo clippy --all-targets ${{ matrix.features }} -- -D warnings
       - name: Test
         run: cargo test ${{ matrix.features }}
 
@@ -56,7 +49,7 @@ jobs:
       - name: Install Rust toolchain
         uses: actions-rs/toolchain@v1
         with:
-            toolchain: "1.65.0"
+            toolchain: stable
             override: true
             profile: minimal
             target: "wasm32-unknown-unknown"
@@ -78,9 +71,27 @@ jobs:
       - name: Install Rust toolchain
         uses: actions-rs/toolchain@v1
         with:
-            toolchain: "1.65.0"
+            toolchain: stable
             override: true
             profile: minimal
             components: rustfmt
       - name: Check fmt
         run: cargo fmt --all -- --config format_code_in_doc_comments=true --check
+
+  clippy_check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions-rs/toolchain@v1
+        with:
+            # we pin clippy instead of using "stable" so that our CI doesn't break
+            # at each new cargo release
+            toolchain: "1.67.0"
+            components: clippy
+            override: true
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2.2.1
+      - uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --all-features --all-targets -- -D warnings
index 053bf8a661888b30bb7a8cfeafea38fd6086bd5f..67032cd3cca9d1f7fcdf8b2babe37cdfbdf27bc3 100644 (file)
@@ -1408,7 +1408,6 @@ impl<D> Wallet<D> {
 
     /// Given the options returns the list of utxos that must be used to form the
     /// transaction and any further that may be used if needed.
-    #[allow(clippy::type_complexity)]
     #[allow(clippy::too_many_arguments)]
     fn preselect_utxos(
         &self,