Skip to content

Commit

Permalink
Merge pull request #251 from tnull/2024-02-pin-ahash
Browse files Browse the repository at this point in the history
Pin `ahash` to 0.8.6 in CI for now
  • Loading branch information
tnull authored Feb 15, 2024
2 parents 6dcee91 + 8c266ef commit 741e706
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/kotlin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:
distribution: temurin
java-version: 11

- name: Set default Rust version to 1.73.0
run: rustup default 1.73.0
- name: Set default Rust version to stable
run: rustup default stable

- name: Show default version of NDK
run: echo $ANDROID_NDK_ROOT
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,17 @@ jobs:
run: |
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal --default-toolchain ${{ matrix.toolchain }}
rustup override set ${{ matrix.toolchain }}
- name: Check formatting on Rust ${{ matrix.toolchain }}
if: matrix.check-fmt
run: rustup component add rustfmt && cargo fmt --all -- --check
- name: Pin packages to allow for MSRV
if: matrix.msrv
run: |
cargo update -p hashlink --precise "0.8.2" --verbose # hashlink 0.8.3 requires hashbrown 0.14, requiring 1.64.0
cargo update -p proptest --precise "1.2.0" --verbose # proptest 1.3.0 requires rustc 1.64.0
cargo update -p reqwest --precise "0.11.20" --verbose # reqwest 0.11.21 broke 1.63.0 MSRV
cargo update -p regex --precise "1.9.6" --verbose # regex 1.10.0 requires rustc 1.65.0
cargo update -p home --precise "0.5.5" --verbose # home v0.5.9, requires rustc 1.70 or newer
cargo update -p [email protected] --precise "0.8.6" --verbose # ahash v0.8.7 is broken and v0.8.8 requires rustc 1.72.0
- name: Set RUSTFLAGS to deny warnings
if: "matrix.toolchain == 'stable'"
run: echo "RUSTFLAGS=-D warnings" >> "$GITHUB_ENV"
Expand Down Expand Up @@ -80,6 +83,3 @@ jobs:
if: "matrix.platform != 'windows-latest' && matrix.build-uniffi"
run: |
RUSTFLAGS="--cfg no_download" cargo test --features uniffi
- name: Check formatting on Rust ${{ matrix.toolchain }}
if: matrix.check-fmt
run: rustup component add rustfmt && cargo fmt --all -- --check
2 changes: 1 addition & 1 deletion src/fee_estimator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ use lightning::chain::chaininterface::{
use bdk::FeeRate;
use esplora_client::AsyncClient as EsploraClient;

use bitcoin::Network;
use bitcoin::blockdata::weight::Weight;
use bitcoin::Network;

use std::collections::HashMap;
use std::ops::Deref;
Expand Down

0 comments on commit 741e706

Please sign in to comment.