diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cbc50ba581f..ca0818d3a85 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -261,10 +261,10 @@ jobs: - name: Install Rust ${{ env.TOOLCHAIN }} toolchain run: | curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal --default-toolchain ${{ env.TOOLCHAIN }} - - name: Pin the regex dependency + - name: Pin the syn and regex dependencies run: | - cd fuzz && cargo update -p regex --precise "1.9.6" --verbose - cd write-seeds && cargo update -p regex --precise "1.9.6" --verbose + cd fuzz && cargo update -p regex --precise "1.9.6" && cargo update -p syn --precise "2.0.106" + cd write-seeds && cargo update -p regex --precise "1.9.6" && cargo update -p syn --precise "2.0.106" - name: Sanity check fuzz targets on Rust ${{ env.TOOLCHAIN }} run: | cd fuzz diff --git a/ci/ci-tests.sh b/ci/ci-tests.sh index 65cdb42d395..f8551ee7a70 100755 --- a/ci/ci-tests.sh +++ b/ci/ci-tests.sh @@ -11,6 +11,9 @@ function PIN_RELEASE_DEPS { # Starting with version 1.39.0, the `tokio` crate has an MSRV of rustc 1.70.0 [ "$RUSTC_MINOR_VERSION" -lt 70 ] && cargo update -p tokio --precise "1.38.1" --verbose + # syn 2.0.107 requires rustc 1.68.0 + [ "$RUSTC_MINOR_VERSION" -lt 68 ] && cargo update -p syn --precise "2.0.106" --verbose + return 0 # Don't fail the script if our rustc is higher than the last check } @@ -50,6 +53,7 @@ cargo test --verbose --color always echo -e "\n\nTesting upgrade from prior versions of LDK" pushd lightning-tests [ "$RUSTC_MINOR_VERSION" -lt 65 ] && cargo update -p regex --precise "1.9.6" --verbose +[ "$RUSTC_MINOR_VERSION" -lt 68 ] && cargo update -p syn --precise "2.0.106" --verbose cargo test popd @@ -120,6 +124,7 @@ cargo test -p lightning-invoice --verbose --color always --no-default-features - echo -e "\n\nTesting no_std build on a downstream no-std crate" # check no-std compatibility across dependencies pushd no-std-check +[ "$RUSTC_MINOR_VERSION" -lt 68 ] && cargo update -p syn --precise "2.0.106" --verbose cargo check --verbose --color always [ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean popd