From 1a632762c38be8735856fffe9013525b76245654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Og=C3=B3rek?= Date: Thu, 23 Feb 2023 13:28:47 +0100 Subject: [PATCH 1/4] ci: Fixup toolchain for MSRV job and cleanup rust setup --- .github/workflows/ci.yml | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 28ea86dda..1d5cd2871 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - name: Checkout sources uses: actions/checkout@v3 - - run: rustup toolchain install stable --profile minimal --component rustfmt --component clippy --no-self-update + - run: rustup component add rustfmt clippy - uses: Swatinem/rust-cache@v2 @@ -30,20 +30,14 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - rust: [stable] - name: Check feature permutations using Rust ${{ matrix.rust }} on ${{ matrix.os }} + name: Check feature permutations using Rust stable on ${{ matrix.os }} runs-on: ${{ matrix.os }} - env: - RUSTFLAGS: -Dwarnings - steps: - name: Checkout sources uses: actions/checkout@v3 - - run: rustup toolchain install ${{ matrix.rust }} --profile minimal --no-self-update - - uses: Swatinem/rust-cache@v2 - run: make checkall @@ -53,17 +47,14 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - rust: [stable] - name: Test using Rust ${{ matrix.rust }} on ${{ matrix.os }} + name: Test using Rust stable on ${{ matrix.os }} runs-on: ${{ matrix.os }} steps: - name: Checkout sources uses: actions/checkout@v3 - - run: rustup toolchain install ${{ matrix.rust }} --profile minimal --no-self-update - - uses: Swatinem/rust-cache@v2 - name: Run cargo test @@ -76,17 +67,17 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] rust: [1.60.0] - name: Check / Test MSRV on ${{ matrix.os }} + name: Check/Test MSRV (${{ matrix.rust }}) on ${{ matrix.os }} runs-on: ${{ matrix.os }} - env: - RUSTFLAGS: -Dwarnings - steps: - name: Checkout sources uses: actions/checkout@v3 - - run: rustup toolchain install ${{ matrix.rust }} --profile minimal --no-self-update + - name: Install rust ${{ matrix.rust }} toolchain + run: | + rustup toolchain install ${{ matrix.rust }} --profile minimal --no-self-update + rustup default ${{ matrix.rust }} - uses: Swatinem/rust-cache@v2 @@ -101,7 +92,7 @@ jobs: steps: - uses: actions/checkout@v3 - - run: rustup toolchain install stable --profile minimal --component llvm-tools-preview --no-self-update + - run: rustup component add llvm-tools-preview - uses: Swatinem/rust-cache@v2 @@ -123,7 +114,7 @@ jobs: - name: Checkout sources uses: actions/checkout@v3 - - run: rustup toolchain install stable --profile minimal --component rust-docs --no-self-update + - run: rustup component add rust-docs - uses: Swatinem/rust-cache@v2 From 6d8945fa337feb1509a04d38a5e5c96e8e25ab0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Og=C3=B3rek?= Date: Thu, 23 Feb 2023 15:16:40 +0100 Subject: [PATCH 2/4] Update .github/workflows/ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1d5cd2871..4063a7db8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,7 +67,7 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] rust: [1.60.0] - name: Check/Test MSRV (${{ matrix.rust }}) on ${{ matrix.os }} + name: Check / Test MSRV on ${{ matrix.os }} runs-on: ${{ matrix.os }} steps: From fe7433ae4f8269ff5ee9b21c0286703f309fa1ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Og=C3=B3rek?= Date: Thu, 23 Feb 2023 22:33:31 +0100 Subject: [PATCH 3/4] Update README for MSRV --- .github/workflows/ci.yml | 2 +- README.md | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4063a7db8..68b8c0b37 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,7 +65,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - rust: [1.60.0] + rust: [1.66.0] name: Check / Test MSRV on ${{ matrix.os }} runs-on: ${{ matrix.os }} diff --git a/README.md b/README.md index d243742c7..3404fdfd2 100644 --- a/README.md +++ b/README.md @@ -93,10 +93,14 @@ best API and adding new features. We currently only verify this crate against a recent version of Sentry hosted on [sentry.io](https://sentry.io/) but it should work with on-prem Sentry versions 20.6 and later. -The **Minimum Supported Rust Version** is currently at _1.60.0_. -The Sentry crates will support a _6 month_ old Rust version at time of release, +The **Minimum Supported Rust Version** is currently at _1.66.0_. +The Sentry crates will support a _6 months_ old Rust version at time of release, and the MSRV will be increased in accordance with its dependencies. +**Note**: Due to the misconfiguration in our workflow that verified the MSRV builds, +we had to bump it all the way to _1.66.0_, breaking our own _6 months_ old rule. +As of version _0.30.0_, the workflow has been fixed, and the MSRV will be enforced correctly. + ## Resources - [Discord](https://discord.gg/ez5KZN7) server for project discussions. From df476d760c0476d895762a3df871f4101ac583d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Og=C3=B3rek?= Date: Thu, 23 Feb 2023 22:35:53 +0100 Subject: [PATCH 4/4] And versions as well --- clippy.toml | 2 +- sentry-actix/Cargo.toml | 2 +- sentry-anyhow/Cargo.toml | 2 +- sentry-backtrace/Cargo.toml | 2 +- sentry-contexts/Cargo.toml | 2 +- sentry-core/Cargo.toml | 2 +- sentry-debug-images/Cargo.toml | 2 +- sentry-log/Cargo.toml | 2 +- sentry-panic/Cargo.toml | 2 +- sentry-slog/Cargo.toml | 2 +- sentry-tower/Cargo.toml | 2 +- sentry-tracing/Cargo.toml | 2 +- sentry-types/Cargo.toml | 2 +- sentry/Cargo.toml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/clippy.toml b/clippy.toml index 16caf02ee..e90d7e34a 100644 --- a/clippy.toml +++ b/clippy.toml @@ -1 +1 @@ -msrv = "1.60.0" +msrv = "1.66.0" diff --git a/sentry-actix/Cargo.toml b/sentry-actix/Cargo.toml index 9503c22e5..b454067c1 100644 --- a/sentry-actix/Cargo.toml +++ b/sentry-actix/Cargo.toml @@ -10,7 +10,7 @@ description = """ Sentry client extension for actix-web 3. """ edition = "2021" -rust-version = "1.60" +rust-version = "1.66" [dependencies] actix-web = { version = "4", default-features = false } diff --git a/sentry-anyhow/Cargo.toml b/sentry-anyhow/Cargo.toml index f05d897d0..c646a3aa3 100644 --- a/sentry-anyhow/Cargo.toml +++ b/sentry-anyhow/Cargo.toml @@ -10,7 +10,7 @@ description = """ Sentry integration for anyhow. """ edition = "2021" -rust-version = "1.60" +rust-version = "1.66" [features] default = ["backtrace"] diff --git a/sentry-backtrace/Cargo.toml b/sentry-backtrace/Cargo.toml index 514ab3ec5..ab838ac31 100644 --- a/sentry-backtrace/Cargo.toml +++ b/sentry-backtrace/Cargo.toml @@ -10,7 +10,7 @@ description = """ Sentry integration and utilities for dealing with stacktraces. """ edition = "2021" -rust-version = "1.60" +rust-version = "1.66" [dependencies] backtrace = "0.3.44" diff --git a/sentry-contexts/Cargo.toml b/sentry-contexts/Cargo.toml index a5a0e1278..c7637169a 100644 --- a/sentry-contexts/Cargo.toml +++ b/sentry-contexts/Cargo.toml @@ -11,7 +11,7 @@ Sentry integration for os, device, and rust contexts. """ build = "build.rs" edition = "2021" -rust-version = "1.60" +rust-version = "1.66" [dependencies] sentry-core = { version = "0.29.3", path = "../sentry-core" } diff --git a/sentry-core/Cargo.toml b/sentry-core/Cargo.toml index f7f6626d8..e0a2d276a 100644 --- a/sentry-core/Cargo.toml +++ b/sentry-core/Cargo.toml @@ -10,7 +10,7 @@ description = """ Core sentry library used for instrumentation and integration development. """ edition = "2021" -rust-version = "1.60" +rust-version = "1.66" [package.metadata.docs.rs] all-features = true diff --git a/sentry-debug-images/Cargo.toml b/sentry-debug-images/Cargo.toml index 2486f4f07..4385abbe2 100644 --- a/sentry-debug-images/Cargo.toml +++ b/sentry-debug-images/Cargo.toml @@ -10,7 +10,7 @@ description = """ Sentry integration that adds the list of loaded libraries to events. """ edition = "2021" -rust-version = "1.60" +rust-version = "1.66" [dependencies] findshlibs = "=0.10.2" diff --git a/sentry-log/Cargo.toml b/sentry-log/Cargo.toml index 732ef2622..2103aa35c 100644 --- a/sentry-log/Cargo.toml +++ b/sentry-log/Cargo.toml @@ -10,7 +10,7 @@ description = """ Sentry integration for log and env_logger crates. """ edition = "2021" -rust-version = "1.60" +rust-version = "1.66" [dependencies] sentry-core = { version = "0.29.3", path = "../sentry-core" } diff --git a/sentry-panic/Cargo.toml b/sentry-panic/Cargo.toml index 6bbbfe34e..b1ab787b4 100644 --- a/sentry-panic/Cargo.toml +++ b/sentry-panic/Cargo.toml @@ -10,7 +10,7 @@ description = """ Sentry integration for capturing panics. """ edition = "2021" -rust-version = "1.60" +rust-version = "1.66" [dependencies] sentry-core = { version = "0.29.3", path = "../sentry-core" } diff --git a/sentry-slog/Cargo.toml b/sentry-slog/Cargo.toml index 31c372f97..01b286251 100644 --- a/sentry-slog/Cargo.toml +++ b/sentry-slog/Cargo.toml @@ -10,7 +10,7 @@ description = """ Sentry integration for the slog crate. """ edition = "2021" -rust-version = "1.60" +rust-version = "1.66" [dependencies] sentry-core = { version = "0.29.3", path = "../sentry-core" } diff --git a/sentry-tower/Cargo.toml b/sentry-tower/Cargo.toml index 51e9e61a3..a3b36b649 100644 --- a/sentry-tower/Cargo.toml +++ b/sentry-tower/Cargo.toml @@ -10,7 +10,7 @@ description = """ Sentry integration for tower-based crates. """ edition = "2021" -rust-version = "1.60" +rust-version = "1.66" [features] http = ["dep:http", "pin-project", "url"] diff --git a/sentry-tracing/Cargo.toml b/sentry-tracing/Cargo.toml index 5379de101..89601db5e 100644 --- a/sentry-tracing/Cargo.toml +++ b/sentry-tracing/Cargo.toml @@ -10,7 +10,7 @@ description = """ Sentry integration for tracing and tracing-subscriber crates. """ edition = "2021" -rust-version = "1.60" +rust-version = "1.66" [dependencies] sentry-core = { version = "0.29.3", path = "../sentry-core", features = ["client"] } diff --git a/sentry-types/Cargo.toml b/sentry-types/Cargo.toml index 3a4fa8428..8f03ed453 100644 --- a/sentry-types/Cargo.toml +++ b/sentry-types/Cargo.toml @@ -11,7 +11,7 @@ Common reusable types for implementing the sentry.io protocol. """ keywords = ["sentry", "protocol"] edition = "2021" -rust-version = "1.60" +rust-version = "1.66" [package.metadata.docs.rs] all-features = true diff --git a/sentry/Cargo.toml b/sentry/Cargo.toml index eb0198daa..47337ff54 100644 --- a/sentry/Cargo.toml +++ b/sentry/Cargo.toml @@ -10,7 +10,7 @@ description = """ Sentry (getsentry.com) client for rust ;) """ edition = "2021" -rust-version = "1.60" +rust-version = "1.66" autoexamples = true # To build locally: