From b2ecd6a1ff103501fa845fc0f18b6dad56d1f1cb Mon Sep 17 00:00:00 2001 From: Conrado Gouvea Date: Mon, 11 Sep 2023 15:15:35 -0300 Subject: [PATCH] improve CI; bump to 4.0.3 --- .github/workflows/main.yml | 44 +++++++++++--------------------------- CHANGELOG.md | 4 ++++ Cargo.toml | 3 ++- rust-toolchain | 1 - 4 files changed, 18 insertions(+), 34 deletions(-) delete mode 100644 rust-toolchain diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 57154c9..f6ae608 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,49 +8,29 @@ on: - main jobs: - test_msrv: - name: test on MSRV + build_msrv: + name: build on MSRV runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.5.3 - - uses: actions-rs/toolchain@v1.0.7 - with: - # When toolchain is not specified, it uses rust-toolchain, which is the MSRV - override: true - - uses: actions-rs/cargo@v1.0.3 - with: - command: test - args: --all-features + - uses: actions/checkout@v4.0.0 + - uses: dtolnay/rust-toolchain@1.65.0 + - run: cargo build --all-features test_nightly: name: test on nightly runs-on: ubuntu-latest steps: - - uses: actions/checkout@master - # Because we use nightly features for building docs, - # using --all-features will fail without nightly toolchain. - - uses: actions-rs/toolchain@v1.0.7 - with: - toolchain: nightly - override: true - - uses: actions-rs/cargo@v1.0.3 - with: - command: test - args: --all-features + - uses: actions/checkout@v4.0.0 + - uses: dtolnay/rust-toolchain@nightly + - run: cargo test --all-features build_no_std: name: build with no_std runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.5.3 - - uses: actions-rs/toolchain@v1.0.7 + - uses: actions/checkout@v4.0.0 + - uses: dtolnay/rust-toolchain@master with: toolchain: stable - override: true - # This does not support std, so we use to test if no_std works - target: thumbv6m-none-eabi - - uses: actions-rs/cargo@v1.0.3 - with: - command: build - # Disables std feature - args: --no-default-features --target thumbv6m-none-eabi + targets: thumbv6m-none-eabi + - run: cargo build --no-default-features --target thumbv6m-none-eabi diff --git a/CHANGELOG.md b/CHANGELOG.md index e599c95..2c820d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ Entries are listed in reverse chronological order. +# 4.0.3 + +* Update `curve25519-dalek` to `4.1.0` + # 4.0.2 * Update `curve25519-dalek` to `4.0.0` diff --git a/Cargo.toml b/Cargo.toml index ecd6229..015fbe6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,8 @@ name = "ed25519-zebra" # Before publishing: # - update CHANGELOG.md -version = "4.0.2" +# - ensure MSRV below (rust-version) and in main.yml are the same +version = "4.0.3" rust-version = "1.65.0" authors = ["Henry de Valence ", "Zcash Foundation "] license = "MIT OR Apache-2.0" diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index 832e9af..0000000 --- a/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -1.70.0