Skip to content

Commit 5953a2c

Browse files
authored
Prune pins in CI that are no longer needed. (#1588)
* Prune pins in CI that are no longer needed. * Disable the freebsd-16-0-snap CI run. * Revert criterion back to 0.4. It's just a dev-dependency, and the newer versions depend on `alloca` which is more work to cross-compile. * Revert serial_test back to 2.0. * Restore some pins now that the dev-dependencies are downgraded again.
1 parent 9116c05 commit 5953a2c

File tree

3 files changed

+22
-16
lines changed

3 files changed

+22
-16
lines changed

.cirrus.yml

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,21 @@ task:
2727
- . $HOME/.cargo/env
2828
- cargo test --workspace --features=all-apis
2929

30-
task:
31-
name: stable x86_64-unknown-freebsd-16
32-
freebsd_instance:
33-
image_family: freebsd-16-0-snap
34-
setup_script:
35-
- curl https://sh.rustup.rs -sSf --output rustup.sh
36-
- sh rustup.sh --default-toolchain stable -y --profile=minimal
37-
- . $HOME/.cargo/env
38-
- rustup default stable
39-
test_script:
40-
- . $HOME/.cargo/env
41-
- cargo test --workspace --features=all-apis
30+
31+
# Temporarily disabled due to this error:
32+
#
33+
# ```
34+
# Failed to start an instance: INVALID_ARGUMENT: Snap images are not supported due to boot stability.
35+
# ```
36+
#task:
37+
# name: stable x86_64-unknown-freebsd-16
38+
# freebsd_instance:
39+
# image_family: freebsd-16-0-snap
40+
# setup_script:
41+
# - curl https://sh.rustup.rs -sSf --output rustup.sh
42+
# - sh rustup.sh --default-toolchain stable -y --profile=minimal
43+
# - . $HOME/.cargo/env
44+
# - rustup default stable
45+
# test_script:
46+
# - . $HOME/.cargo/env
47+
# - cargo test --workspace --features=all-apis

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
cargo update --package=lock_api --precise=0.4.12
6464
cargo update --package=rayon --precise=1.10.0
6565
cargo update --package=rayon-core --precise=1.12.1
66-
cargo update --package=windows-sys@0.61.2 --precise=0.60.2
66+
cargo update --package=windows-sys --precise=0.60.2
6767
cargo update --package=quote --precise=1.0.41
6868
cargo update --package=itoa --precise=1.0.15
6969
cargo update --package=serde_json --precise=1.0.145
@@ -600,7 +600,7 @@ jobs:
600600
cargo update --package=lock_api --precise=0.4.12
601601
cargo update --package=rayon --precise=1.10.0
602602
cargo update --package=rayon-core --precise=1.12.1
603-
cargo update --package=windows-sys@0.61.2 --precise=0.60.2
603+
cargo update --package=windows-sys --precise=0.60.2
604604
cargo update --package=quote --precise=1.0.41
605605
cargo update --package=itoa --precise=1.0.15
606606
cargo update --package=serde_json --precise=1.0.145

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ default-features = false
7171
tempfile = "3.5.0"
7272
libc = "0.2.171"
7373
libc_errno = { package = "errno", version = "0.3.10", default-features = false }
74-
serial_test = "3"
74+
serial_test = "2.0.0"
7575
memoffset = "0.9.0"
7676
flate2 = "1.0"
7777
static_assertions = "1.1.0"
@@ -81,7 +81,7 @@ static_assertions = "1.1.0"
8181
once_cell = "1.20.3"
8282

8383
[target.'cfg(all(criterion, not(any(target_os = "emscripten", target_os = "wasi"))))'.dev-dependencies]
84-
criterion = "0.8"
84+
criterion = "0.4"
8585

8686
# Add Criterion configuration, as described here:
8787
# <https://bheisler.github.io/criterion.rs/book/getting_started.html#step-1---add-dependency-to-cargotoml>

0 commit comments

Comments
 (0)