From f96dec2db189cb21e8f4b5f0d8aa2ecbfc25a406 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Tue, 8 Feb 2022 21:28:11 +0000 Subject: [PATCH 1/2] Bump MSRV to 1.41.1. 1.41.1 is currently the Firefox ESR MSRV, which means its also the version several Linux distros ship. Further, rust-bitcoin is likely to make a similar change soon, see https://github.com/rust-bitcoin/rust-bitcoin/issues/510. --- .github/workflows/build.yml | 10 +++------- CONTRIBUTING.md | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c982060a8c5..120b2f5df0c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,10 +10,8 @@ jobs: platform: [ ubuntu-latest ] toolchain: [ stable, beta, - # 1.36.0 is MSRV for Rust-Lightning, lightning-invoice, and lightning-persister - 1.36.0, - # 1.41.0 is Debian stable - 1.41.0, + # 1.41.1 is MSRV for Rust-Lightning, lightning-invoice, and lightning-persister + 1.41.1, # 1.45.2 is MSRV for lightning-net-tokio, lightning-block-sync, and coverage generation 1.45.2, # 1.47.0 will be the MSRV for no-std builds using hashbrown once core2 is updated @@ -41,11 +39,9 @@ jobs: - toolchain: beta build-net-tokio: true build-no-std: true - - toolchain: 1.36.0 + - toolchain: 1.41.1 build-no-std: false test-log-variants: true - - toolchain: 1.41.0 - build-no-std: false - toolchain: 1.45.2 build-net-old-tokio: true build-net-tokio: true diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2c1fb0d8a73..c0cf28ea8f1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -75,7 +75,7 @@ be covered by functional tests. When refactoring, structure your PR to make it easy to review and don't hestitate to split it into multiple small, focused PRs. -The Minimal Supported Rust Version is 1.36.0 (enforced by our GitHub Actions). +The Minimal Supported Rust Version is 1.41.1 (enforced by our GitHub Actions). Commits should cover both the issue fixed and the solution's rationale. These [guidelines](https://chris.beams.io/posts/git-commit/) should be kept in mind. From 9f277dc136a9fc5232e5d8e77445645a33ce32ed Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Tue, 15 Feb 2022 22:18:49 +0000 Subject: [PATCH 2/2] Use "Minimum", not "Minmal" for MSRV. --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c0cf28ea8f1..ab6ba2a410f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -75,7 +75,7 @@ be covered by functional tests. When refactoring, structure your PR to make it easy to review and don't hestitate to split it into multiple small, focused PRs. -The Minimal Supported Rust Version is 1.41.1 (enforced by our GitHub Actions). +The Minimum Supported Rust Version is 1.41.1 (enforced by our GitHub Actions). Commits should cover both the issue fixed and the solution's rationale. These [guidelines](https://chris.beams.io/posts/git-commit/) should be kept in mind.