From c523711dc66ad1ab0274ed9c8add0f4770288f69 Mon Sep 17 00:00:00 2001 From: Matt Brubeck Date: Sun, 27 Apr 2025 21:37:32 -0700 Subject: [PATCH 1/2] v2: Bump MSRV to 1.83 --- .github/workflows/main.yml | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b17cda8..f51a037 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - toolchain: ["stable", "beta", "nightly", "1.57.0"] + toolchain: ["stable", "beta", "nightly", "1.83.0"] include: - toolchain: stable fuzz: 1 diff --git a/Cargo.toml b/Cargo.toml index e08efc6..d90e58f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "smallvec" version = "2.0.0-alpha.11" edition = "2021" -rust-version = "1.57" +rust-version = "1.83" authors = ["The Servo Project Developers"] license = "MIT OR Apache-2.0" repository = "https://github.com/servo/rust-smallvec" From 742dbf196cdb973eb11d83bd152b31ed8d0525c2 Mon Sep 17 00:00:00 2001 From: Matt Brubeck Date: Sun, 27 Apr 2025 21:39:29 -0700 Subject: [PATCH 2/2] Run GitHub checks on merge_group --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f51a037..79edf65 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,6 +4,8 @@ on: push: branches: [v2] pull_request: + merge_group: + types: [checks_requested] workflow_dispatch: jobs: