From a3d5c41db5731035d535c4156b1da1faa8a9c922 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Sun, 7 Jan 2024 03:34:34 +0900 Subject: [PATCH 1/5] ci: Use cargo-hack's --rust-version flag for msrv check This respects rust-version field in Cargo.toml, so it removes the need to manage MSRV in both the CI file and Cargo.toml. --- .github/workflows/ci.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc49288..64d57a7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,16 +45,11 @@ jobs: msrv: runs-on: ubuntu-latest - strategy: - matrix: - # When updating this, the reminder to update the minimum supported - # Rust version in Cargo.toml. - rust: ['1.59.0'] steps: - uses: actions/checkout@v4 - - name: Install Rust - run: rustup update ${{ matrix.rust }} && rustup default ${{ matrix.rust }} - - run: cargo build + - name: Install cargo-hack + uses: taiki-e/install-action@cargo-hack + - run: cargo hack build --rust-version clippy: runs-on: ubuntu-latest From 05e0dd7c4be4d275090af14c99abcfa7da81cc54 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Sun, 7 Jan 2024 03:35:30 +0900 Subject: [PATCH 2/5] Bump MSRV to 1.60 https://github.com/crossbeam-rs/crossbeam/pull/1056 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 8af27c9..0952f55 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ name = "async-dup" version = "1.2.4" authors = ["Stjepan Glavina "] edition = "2018" -rust-version = "1.59" +rust-version = "1.60" description = "Duplicate an async I/O handle" license = "Apache-2.0 OR MIT" repository = "https://github.com/smol-rs/async-dup" From 3507db58f5bb8bbc5e92b7bf130b3ccadbc1b83f Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Sun, 7 Jan 2024 03:35:57 +0900 Subject: [PATCH 3/5] Migrate to Rust 2021 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 0952f55..c06ab2d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ name = "async-dup" # - Create "v1.x.y" git tag version = "1.2.4" authors = ["Stjepan Glavina "] -edition = "2018" +edition = "2021" rust-version = "1.60" description = "Duplicate an async I/O handle" license = "Apache-2.0 OR MIT" From b447c2dc1c8a9e379503168840d8ddc6fefccb08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 6 Jan 2024 18:39:30 +0000 Subject: [PATCH 4/5] Update smol requirement from 1 to 2 Updates the requirements on [smol](https://github.com/smol-rs/smol) to permit the latest version. - [Release notes](https://github.com/smol-rs/smol/releases) - [Changelog](https://github.com/smol-rs/smol/blob/master/CHANGELOG.md) - [Commits](https://github.com/smol-rs/smol/compare/v1.0.0...v2.0.0) --- updated-dependencies: - dependency-name: smol dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index c06ab2d..2840f00 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,4 +22,4 @@ futures-io = "0.3.5" [dev-dependencies] futures = { version = "0.3.5", default-features = false, features = ["std"] } -smol = "1" +smol = "2" From 470c56811381e088cd28aec4db8a13fc2555832c Mon Sep 17 00:00:00 2001 From: John Nunley Date: Fri, 18 Oct 2024 14:47:27 -0700 Subject: [PATCH 5/5] ci: Use "v2.0.0" branch for security check Signed-off-by: John Nunley --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 64d57a7..941972c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,7 +75,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + # rustsec/audit-check used to do this automatically + - name: Generate Cargo.lock + run: cargo generate-lockfile # https://github.com/rustsec/audit-check/issues/2 - - uses: rustsec/audit-check@master + - uses: rustsec/audit-check@v2.0.0 with: token: ${{ secrets.GITHUB_TOKEN }}