From 53972cdeb3057e9275245c083f5ae8bf983096d7 Mon Sep 17 00:00:00 2001 From: Byron Hambly Date: Tue, 5 Dec 2023 13:21:12 +0200 Subject: [PATCH 1/2] ci: update minimum rust version to 1.70 this is to fix the issue with installing sqlx-cli in ci --- .github/workflows/build-release-binaries.yml | 2 +- .github/workflows/ci.yml | 4 ++-- .github/workflows/draft-new-release.yml | 2 +- CHANGELOG.md | 2 ++ README.md | 2 +- rust-toolchain.toml | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-release-binaries.yml b/.github/workflows/build-release-binaries.yml index 62e25913..45229bc4 100644 --- a/.github/workflows/build-release-binaries.yml +++ b/.github/workflows/build-release-binaries.yml @@ -54,7 +54,7 @@ jobs: - uses: dtolnay/rust-toolchain@master with: - toolchain: 1.67 + toolchain: "1.70" targets: armv7-unknown-linux-gnueabihf - name: Build ${{ matrix.target }} ${{ matrix.bin }} release binary diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d54fc558..2a7ed795 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: - uses: dtolnay/rust-toolchain@master with: - toolchain: 1.67 + toolchain: "1.70" components: clippy,rustfmt - uses: Swatinem/rust-cache@v2.7.1 @@ -84,7 +84,7 @@ jobs: - uses: dtolnay/rust-toolchain@master with: - toolchain: 1.67 + toolchain: "1.70" targets: armv7-unknown-linux-gnueabihf - name: Build binary diff --git a/.github/workflows/draft-new-release.yml b/.github/workflows/draft-new-release.yml index 06bb9052..70a623a8 100644 --- a/.github/workflows/draft-new-release.yml +++ b/.github/workflows/draft-new-release.yml @@ -43,7 +43,7 @@ jobs: id: make-commit env: DPRINT_VERSION: 0.39.1 - RUST_TOOLCHAIN: 1.67 + RUST_TOOLCHAIN: 1.70 run: | rustup component add rustfmt --toolchain "$RUST_TOOLCHAIN-x86_64-unknown-linux-gnu" curl -fsSL https://dprint.dev/install.sh | sh -s $DPRINT_VERSION diff --git a/CHANGELOG.md b/CHANGELOG.md index 160c34a0..4d3ad105 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +- Minimum Supported Rust Version (MSRV) bumped to 1.70 + ## [0.12.3] - 2023-09-20 - Swap: If no Monero daemon is manually specified, we will automatically choose one from a list of public daemons by connecting to each and checking their availability. diff --git a/README.md b/README.md index 7cbccc5a..71a37896 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ Please have a look at the [contribution guidelines](./CONTRIBUTING.md). ## Rust Version Support Please note that only the latest stable Rust toolchain is supported. -All stable toolchains since 1.67 _should_ work. +All stable toolchains since 1.70 _should_ work. ## Contact diff --git a/rust-toolchain.toml b/rust-toolchain.toml index d6b509dd..d03c251b 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.67" # also update this in the readme, changelog, and github actions +channel = "1.70" # also update this in the readme, changelog, and github actions components = ["clippy"] targets = ["armv7-unknown-linux-gnueabihf"] From dbb66fe6b743edc8dc769602f48cea4b1f6448a5 Mon Sep 17 00:00:00 2001 From: Byron Hambly Date: Wed, 6 Dec 2023 13:19:50 +0200 Subject: [PATCH 2/2] ci: remove bors bors has been deprecated for some time and seems to be gone now. --- .github/workflows/ci.yml | 2 -- bors.toml | 25 ------------------------- 2 files changed, 27 deletions(-) delete mode 100644 bors.toml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2a7ed795..64b53e83 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,8 +4,6 @@ on: pull_request: # Need to run on pull-requests, otherwise PRs from forks don't run push: branches: - - "staging" # Bors uses this branch - - "trying" # Bors uses this branch - "master" # Always build head of master for the badge in the README jobs: diff --git a/bors.toml b/bors.toml deleted file mode 100644 index 92e8a84c..00000000 --- a/bors.toml +++ /dev/null @@ -1,25 +0,0 @@ -status = [ - "static_analysis", - "bdk_test", - "sqlx_test", - "build (x86_64-unknown-linux-gnu, ubuntu-latest)", - "build (armv7-unknown-linux-gnueabihf, ubuntu-latest)", - "build (x86_64-apple-darwin, macos-latest)", - "build (x86_64-pc-windows-msvc, windows-latest)", - "test (ubuntu-latest)", - "test (macos-latest)", - "docker_tests (happy_path)", - "docker_tests (happy_path_restart_bob_after_xmr_locked)", - "docker_tests (happy_path_restart_alice_after_xmr_locked)", - "docker_tests (happy_path_restart_bob_before_xmr_locked)", - "docker_tests (alice_and_bob_refund_using_cancel_and_refund_command)", - "docker_tests (alice_and_bob_refund_using_cancel_then_refund_command)", - "docker_tests (alice_and_bob_refund_using_cancel_and_refund_command_timelock_not_expired)", - "docker_tests (punish)", - "docker_tests (alice_punishes_after_restart_bob_dead)", - "docker_tests (alice_manually_punishes_after_bob_dead)", - "docker_tests (alice_refunds_after_restart_bob_refunded)", - "docker_tests (ensure_same_swap_id)", - "docker_tests (concurrent_bobs_before_xmr_lock_proof_sent)", - "docker_tests (alice_manually_redeems_after_enc_sig_learned)" -]