From 8db2ae199116cfeb7bbe520e27a3325cb7247a9b Mon Sep 17 00:00:00 2001 From: Jean-Pierre De Jesus DIAZ Date: Tue, 6 Feb 2024 14:09:07 +0100 Subject: [PATCH 1/3] SFT-3331: Update fsfe/reuse-action. * .github/workflows/lint.yaml (is-reuse-compliant): Update fsfe/reuse-action to v2. Signed-off-by: Jean-Pierre De Jesus DIAZ --- .github/workflows/lint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index a5d994e..9824df9 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: fsfe/reuse-action@v1 + - uses: fsfe/reuse-action@v2 is-the-code-compilable: name: Is the code compilable? From e701571b794459e491f95404ae4f655514e98f47 Mon Sep 17 00:00:00 2001 From: Jean-Pierre De Jesus DIAZ Date: Tue, 6 Feb 2024 14:48:05 +0100 Subject: [PATCH 2/3] SFT-3331: Update dtolnay/rust-toolchain action. * .github/actions/rust-toolchain/action.yml: Update. Signed-off-by: Jean-Pierre De Jesus DIAZ --- .github/actions/rust-toolchain/action.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/actions/rust-toolchain/action.yml b/.github/actions/rust-toolchain/action.yml index 63b7096..03aef0d 100644 --- a/.github/actions/rust-toolchain/action.yml +++ b/.github/actions/rust-toolchain/action.yml @@ -62,7 +62,7 @@ runs: - run: | : install rustup if needed if ! command -v rustup &>/dev/null; then - curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL "https://sh.rustup.rs" | sh -s -- --default-toolchain none -y + curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused --location --silent --show-error --fail "https://sh.rustup.rs" | sh -s -- --default-toolchain none -y echo "${CARGO_HOME:-$HOME/.cargo}/bin" >> $GITHUB_PATH fi if: runner.os != 'Windows' @@ -99,16 +99,25 @@ runs: - run: | : enable Cargo sparse registry - # except on 1.66 and 1.67, on which it is unstable + # implemented in 1.66, stabilized in 1.68, made default in 1.70 if [ -z "${CARGO_REGISTRIES_CRATES_IO_PROTOCOL+set}" -o -f "${{runner.temp}}"/.implicit_cargo_registries_crates_io_protocol ]; then - touch "${{runner.temp}}"/.implicit_cargo_registries_crates_io_protocol || true - if rustc +${{steps.parse.outputs.toolchain}} --version --verbose | (! grep -q '^release: 1\.6[67]\.'); then + if rustc +${{steps.parse.outputs.toolchain}} --version --verbose | grep -q '^release: 1\.6[89]\.'; then + touch "${{runner.temp}}"/.implicit_cargo_registries_crates_io_protocol || true echo CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse >> $GITHUB_ENV - else + elif rustc +${{steps.parse.outputs.toolchain}} --version --verbose | grep -q '^release: 1\.6[67]\.'; then + touch "${{runner.temp}}"/.implicit_cargo_registries_crates_io_protocol || true echo CARGO_REGISTRIES_CRATES_IO_PROTOCOL=git >> $GITHUB_ENV fi fi shell: bash + - run: | + : work around spurious network errors in curl 8.0 + # https://rust-lang.zulipchat.com/#narrow/stream/246057-t-cargo/topic/timeout.20investigation + if rustc +${{steps.parse.outputs.toolchain}} --version --verbose | grep -q '^release: 1\.7[01]\.'; then + echo CARGO_HTTP_MULTIPLEXING=false >> $GITHUB_ENV + fi + shell: bash + - run: rustc +${{steps.parse.outputs.toolchain}} --version --verbose shell: bash From a4f50616ace78ea40e36f1962a651f97384a49de Mon Sep 17 00:00:00 2001 From: Jean-Pierre De Jesus DIAZ Date: Tue, 6 Feb 2024 14:22:46 +0100 Subject: [PATCH 3/3] SFT-3331: Update MSRV to 1.70. * README.md: Update. * .github/workflows/dependencies.yaml: Ditto. * .github/workflows/ffi.yaml: Ditto. * .github/workflows/lint.yaml: Ditto. * rust-toolchain.toml: Ditto. Signed-off-by: Jean-Pierre De Jesus DIAZ --- .github/workflows/dependencies.yaml | 4 ++-- .github/workflows/ffi.yaml | 4 ++-- .github/workflows/lint.yaml | 6 +++--- README.md | 2 +- rust-toolchain.toml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/dependencies.yaml b/.github/workflows/dependencies.yaml index 255fecf..d741a13 100644 --- a/.github/workflows/dependencies.yaml +++ b/.github/workflows/dependencies.yaml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - uses: ./.github/actions/rust-toolchain with: - toolchain: 1.66 + toolchain: 1.70 - run: cargo install --locked cargo-audit - run: cargo audit @@ -27,7 +27,7 @@ jobs: - uses: actions/checkout@v4 - uses: ./.github/actions/rust-toolchain with: - toolchain: 1.66 + toolchain: 1.70 - run: cargo install --locked cargo-sort - run: cargo sort --workspace --check diff --git a/.github/workflows/ffi.yaml b/.github/workflows/ffi.yaml index 6a789c1..5074c25 100644 --- a/.github/workflows/ffi.yaml +++ b/.github/workflows/ffi.yaml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v4 - uses: ./.github/actions/rust-toolchain with: - toolchain: 1.66 + toolchain: 1.70 - run: cargo install cbindgen@^0.24 - run: | cbindgen --config ffi/cbindgen.toml \ @@ -33,7 +33,7 @@ jobs: - uses: actions/checkout@v4 - uses: ./.github/actions/rust-toolchain with: - toolchain: 1.66 + toolchain: 1.70 - run: sudo apt-get install -y cmake nlohmann-json3-dev - run: | cmake -S ffi/integration/ \ diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 9824df9..0723347 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v4 - uses: ./.github/actions/rust-toolchain with: - toolchain: 1.66 + toolchain: 1.70 - run: cargo check # The foundation-ffi crate won't compile for x86_64 targets because it # requires a nightly Rust compiler for defining a global allocator and @@ -36,7 +36,7 @@ jobs: - uses: actions/checkout@v4 - uses: ./.github/actions/rust-toolchain with: - toolchain: 1.66 + toolchain: 1.70 components: rustfmt - run: cargo fmt --all -- --check @@ -48,7 +48,7 @@ jobs: - uses: actions/checkout@v4 - uses: ./.github/actions/rust-toolchain with: - toolchain: 1.66 + toolchain: 1.70 - run: cargo test - run: cargo test --no-default-features - run: cargo test --all-features diff --git a/README.md b/README.md index a94d55d..bde9e88 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ SPDX-License-Identifier: GPL-3.0-or-later ## Minimum Supported Rust Version (MSRV). -The minimum supported version Rust version is `1.65.0`. +The minimum supported version Rust version is `1.70`. ## Licensing diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 3c72868..d036ad6 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -3,6 +3,6 @@ # Keep this in sync. with the CI. [toolchain] -channel = "1.66" +channel = "1.70" profile = "default" targets = ["thumbv7em-none-eabihf"]