Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update criterion requirement from 0.4 to 0.5 #495

Merged
merged 3 commits into from
Oct 29, 2023
Merged

Update criterion requirement from 0.4 to 0.5 #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4590bf
Update criterion requirement from 0.4 to 0.5
dependabot[bot] Oct 29, 2023
d2bc8f8
ci: add msrv exemption for clap
robjtede Oct 29, 2023
8b9d4fb
Merge branch 'master' into dependabot/cargo/criterion-0.5
robjtede Oct 29, 2023
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
23 changes: 13 additions & 10 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
- { name: Windows (MinGW), os: windows-latest, triple: x86_64-pc-windows-gnu }
- { name: Windows (32-bit), os: windows-latest, triple: i686-pc-windows-msvc }
version:
- 1.65.0 # MSRV
- stable
- { name: msrv, version: 1.65.0 }
- { name: stable, version: stable }

name: ${{ matrix.target.name }} / ${{ matrix.version }}
name: ${{ matrix.target.name }} / ${{ matrix.version.name }}
runs-on: ${{ matrix.target.os }}

env: {}
Expand All @@ -52,10 +52,10 @@ jobs:
echo 'OPENSSL_DIR=C:\Program Files\OpenSSL-Win64' | Out-File -FilePath $env:GITHUB_ENV -Append
echo 'OPENSSL_DIR=C:\Program Files\OpenSSL' | Out-File -FilePath $env:GITHUB_ENV -Append

- name: Install Rust (${{ matrix.version }})
- name: Install Rust (${{ matrix.version.name }})
uses: actions-rust-lang/[email protected]
with:
toolchain: ${{ matrix.version }}
toolchain: ${{ matrix.version.version }}

- uses: taiki-e/[email protected]
with:
Expand All @@ -65,9 +65,12 @@ jobs:
run: cargo generate-lockfile

- name: workaround MSRV issues
if: matrix.version != 'stable'
if: matrix.version.name == 'msrv'
run: |
cargo update -p=time --precise=0.3.16 # time is only a dev dep so shouldn't affect msrv
cargo update -p=time --precise=0.3.16
cargo update -p=clap --precise=4.3.24
cargo update -p=clap_lex --precise=0.5.0
cargo update -p=anstyle --precise=1.0.2

- name: check lib
if: >
Expand Down Expand Up @@ -106,9 +109,9 @@ jobs:
ulimit -Sl 512
&& ulimit -Hl 512
&& PATH=$PATH:/usr/share/rust/.cargo/bin
&& RUSTUP_TOOLCHAIN=${{ matrix.version }} cargo ci-test-rustls-020
&& RUSTUP_TOOLCHAIN=${{ matrix.version }} cargo ci-test-rustls-021
&& RUSTUP_TOOLCHAIN=${{ matrix.version }} cargo ci-test-linux
&& RUSTUP_TOOLCHAIN=${{ matrix.version.version }} cargo ci-test-rustls-020
&& RUSTUP_TOOLCHAIN=${{ matrix.version.version }} cargo ci-test-rustls-021
&& RUSTUP_TOOLCHAIN=${{ matrix.version.version }} cargo ci-test-linux
"

- name: Clear the cargo caches
Expand Down
2 changes: 1 addition & 1 deletion actix-codec/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ tokio-util = { version = "0.7", features = ["codec", "io"] }
tracing = { version = "0.1.30", default-features = false, features = ["log"] }

[dev-dependencies]
criterion = { version = "0.4", features = ["html_reports"] }
criterion = { version = "0.5", features = ["html_reports"] }
tokio-test = "0.4.2"

[[bench]]
Expand Down