ci: Set default rust toolchain to MSRV for MSRV job (#555)

* ci: Set default rust toolchain to MSRV for MSRV job * Update .github/workflows/ci.yml
getsentry · Feb 24, 2023 · 569b0d9 · 569b0d9
1 parent 3437977
commit 569b0d9
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 35 deletions.
diff --git 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
@@ -74,19 +65,19 @@ 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 }}
 
-    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
 

diff --git 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.

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: