Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ runs:
with:
key: ${{ inputs.rust-version }} # proxy value for glibc version
- if: runner.os == 'Linux'
run: cargo install --locked bpf-linker
run: cargo install --locked bpf-linker@0.9.15
shell: bash
5 changes: 3 additions & 2 deletions .github/workflows/autofix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ concurrency:
cancel-in-progress: true

env:
MSRV: "1.85" # Minimum Supported Rust Version
MSRV: "1.86" # Minimum Supported Rust Version

jobs:
protobuf:
runs-on: macos-latest
steps:
- uses: mhils/workflows/checkout@5b6540d578f48644ffa5e955cedadc81034cb7d8 # v18.0
- run: brew install swift-protobuf
# FIXME: https://github.com/mitmproxy/mitmproxy/issues/7877 - bump SwiftProtobuf and then re-add this here.
# - run: brew install swift-protobuf
- run: cargo install protoc-gen-prost
- run: protoc --proto_path=./src/ipc/ mitmproxy_ipc.proto
--prost_out=./src/ipc/
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:
matrix:
include:
- os: windows-latest
rust: "1.85" # MSRV - can't use variables here.
rust: "1.86" # MSRV - can't use variables here.
args: --exclude mitmproxy-linux-ebpf
- os: macos-latest
rust: "1.85" # MSRV - can't use variables here.
rust: "1.86" # MSRV - can't use variables here.
args: --exclude mitmproxy-linux-ebpf
- os: ubuntu-22.04
rust: "1.85" # MSRV - can't use variables here.
rust: "1.86" # MSRV - can't use variables here.
args: --exclude mitmproxy-linux-ebpf
- os: ubuntu-latest
rust: stable
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ version = "0.13.0-dev"
publish = false
repository = "https://github.com/mitmproxy/mitmproxy-rs"
edition = "2021"
rust-version = "1.85" # MSRV
rust-version = "1.86" # MSRV

[workspace.dependencies]
aya = { version = "0.13.0", default-features = false }
Expand Down
Loading