Skip to content

Commit fbd9586

Browse files
authored
Add Criterion as dev-dependency, fix CI for MSRV and minimal-versions (#1275)
* Add criterion as dev-dependency * CI[minimal-versions]: require regex 1.5.1
1 parent 81d7dc7 commit fbd9586

File tree

3 files changed

+717
-2
lines changed

3 files changed

+717
-2
lines changed

.github/workflows/test.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ jobs:
4646
# Test both windows-gnu and windows-msvc; use beta rust on one
4747
- os: ubuntu-latest
4848
target: x86_64-unknown-linux-gnu
49-
toolchain: 1.56.0 # MSRV
49+
variant: MSRV
50+
toolchain: 1.56.0
5051
- os: ubuntu-latest
5152
deps: sudo apt-get update ; sudo apt install gcc-multilib
5253
target: i686-unknown-linux-gnu
@@ -58,6 +59,9 @@ jobs:
5859

5960
steps:
6061
- uses: actions/checkout@v3
62+
- name: MSRV
63+
if: ${{ matrix.variant == 'MSRV' }}
64+
run: cp Cargo.lock.msrv Cargo.lock
6165
- name: Install toolchain
6266
uses: dtolnay/rust-toolchain@master
6367
with:
@@ -66,7 +70,10 @@ jobs:
6670
- run: ${{ matrix.deps }}
6771
- name: Maybe minimal versions
6872
if: ${{ matrix.variant == 'minimal_versions' }}
69-
run: cargo generate-lockfile -Z minimal-versions
73+
run: |
74+
cargo generate-lockfile -Z minimal-versions
75+
# Overrides for dependencies with incorrect requirements (may need periodic updating)
76+
cargo update -p regex --precise 1.5.1
7077
- name: Maybe nightly
7178
if: ${{ matrix.toolchain == 'nightly' }}
7279
run: |

0 commit comments

Comments
 (0)