Skip to content

Commit 7bf6c54

Browse files
authored
bump MSRV to 1.86 (#282)
1 parent 195e6e4 commit 7bf6c54

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

.github/actions/setup/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ runs:
2727
with:
2828
key: ${{ inputs.rust-version }} # proxy value for glibc version
2929
- if: runner.os == 'Linux'
30-
run: cargo install --locked bpf-linker
30+
run: cargo install --locked bpf-linker@0.9.15
3131
shell: bash

.github/workflows/autofix.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ concurrency:
1111
cancel-in-progress: true
1212

1313
env:
14-
MSRV: "1.85" # Minimum Supported Rust Version
14+
MSRV: "1.86" # Minimum Supported Rust Version
1515

1616
jobs:
1717
protobuf:
1818
runs-on: macos-latest
1919
steps:
2020
- uses: mhils/workflows/checkout@5b6540d578f48644ffa5e955cedadc81034cb7d8 # v18.0
21-
- run: brew install swift-protobuf
21+
# FIXME: https://github.com/mitmproxy/mitmproxy/issues/7877 - bump SwiftProtobuf and then re-add this here.
22+
# - run: brew install swift-protobuf
2223
- run: cargo install protoc-gen-prost
2324
- run: protoc --proto_path=./src/ipc/ mitmproxy_ipc.proto
2425
--prost_out=./src/ipc/

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ jobs:
2222
matrix:
2323
include:
2424
- os: windows-latest
25-
rust: "1.85" # MSRV - can't use variables here.
25+
rust: "1.86" # MSRV - can't use variables here.
2626
args: --exclude mitmproxy-linux-ebpf
2727
- os: macos-latest
28-
rust: "1.85" # MSRV - can't use variables here.
28+
rust: "1.86" # MSRV - can't use variables here.
2929
args: --exclude mitmproxy-linux-ebpf
3030
- os: ubuntu-22.04
31-
rust: "1.85" # MSRV - can't use variables here.
31+
rust: "1.86" # MSRV - can't use variables here.
3232
args: --exclude mitmproxy-linux-ebpf
3333
- os: ubuntu-latest
3434
rust: stable

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ version = "0.13.0-dev"
3232
publish = false
3333
repository = "https://github.com/mitmproxy/mitmproxy-rs"
3434
edition = "2021"
35-
rust-version = "1.85" # MSRV
35+
rust-version = "1.86" # MSRV
3636

3737
[workspace.dependencies]
3838
aya = { version = "0.13.0", default-features = false }

0 commit comments

Comments
 (0)