Skip to content

Commit 70a3fce

Browse files
committed
ci: use a fixed stable on 1.25.x (#5732)
This cherry-picks chore: remove ntapi dev-dependency
1 parent 88b1eb5 commit 70a3fce

File tree

6 files changed

+301
-81
lines changed

6 files changed

+301
-81
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
resource_class: arm.medium
77
environment:
88
# Change to pin rust version
9-
RUST_STABLE: stable
9+
RUST_STABLE: 1.67.1
1010
steps:
1111
- checkout
1212
- run:

.cirrus.yml

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
only_if: $CIRRUS_TAG == '' && ($CIRRUS_PR != '' || $CIRRUS_BRANCH == 'master' || $CIRRUS_BRANCH =~ 'tokio-.*')
2+
auto_cancellation: $CIRRUS_BRANCH != 'master' && $CIRRUS_BRANCH !=~ 'tokio-.*'
13
freebsd_instance:
2-
image: freebsd-12-4-release-amd64
4+
image_family: freebsd-13-1
35
env:
4-
RUST_STABLE: stable
6+
RUST_STABLE: 1.67.1
57
RUST_NIGHTLY: nightly-2022-10-25
68
RUSTFLAGS: -D warnings
79

@@ -11,9 +13,8 @@ env:
1113
# the system's binaries, so the environment shouldn't matter.
1214
task:
1315
name: FreeBSD 64-bit
14-
auto_cancellation: $CIRRUS_BRANCH != 'master' && $CIRRUS_BRANCH !=~ 'tokio-.*'
1516
setup_script:
16-
- pkg install -y bash curl
17+
- pkg install -y bash
1718
- curl https://sh.rustup.rs -sSf --output rustup.sh
1819
- sh rustup.sh -y --profile minimal --default-toolchain $RUST_STABLE
1920
- . $HOME/.cargo/env
@@ -26,12 +27,11 @@ task:
2627

2728
task:
2829
name: FreeBSD docs
29-
auto_cancellation: $CIRRUS_BRANCH != 'master' && $CIRRUS_BRANCH !=~ 'tokio-.*'
3030
env:
3131
RUSTFLAGS: --cfg docsrs --cfg tokio_unstable
3232
RUSTDOCFLAGS: --cfg docsrs --cfg tokio_unstable -Dwarnings
3333
setup_script:
34-
- pkg install -y bash curl
34+
- pkg install -y bash
3535
- curl https://sh.rustup.rs -sSf --output rustup.sh
3636
- sh rustup.sh -y --profile minimal --default-toolchain $RUST_NIGHTLY
3737
- . $HOME/.cargo/env
@@ -44,9 +44,8 @@ task:
4444

4545
task:
4646
name: FreeBSD 32-bit
47-
auto_cancellation: $CIRRUS_BRANCH != 'master' && $CIRRUS_BRANCH !=~ 'tokio-.*'
4847
setup_script:
49-
- pkg install -y bash curl
48+
- pkg install -y bash
5049
- curl https://sh.rustup.rs -sSf --output rustup.sh
5150
- sh rustup.sh -y --profile minimal --default-toolchain $RUST_STABLE
5251
- . $HOME/.cargo/env

.github/workflows/ci.yml

+1-14
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
RUSTFLAGS: -Dwarnings
1111
RUST_BACKTRACE: 1
1212
# Change to specific Rust release to pin
13-
rust_stable: stable
13+
rust_stable: 1.67.1
1414
rust_nightly: nightly-2022-11-03
1515
rust_clippy: 1.65.0
1616
# When updating this, also update:
@@ -349,19 +349,6 @@ jobs:
349349
with:
350350
toolchain: ${{ env.rust_min }}
351351
- uses: Swatinem/rust-cache@v2
352-
# First compile just the main tokio crate with minrust and newest version
353-
# of all dependencies, then pin once_cell and compile the rest of the
354-
# crates with the pinned once_cell version.
355-
#
356-
# This is necessary because tokio-util transitively depends on once_cell,
357-
# which is not compatible with the current minrust after the 1.15.0
358-
# release.
359-
- name: "check -p tokio --all-features"
360-
run: cargo check -p tokio --all-features
361-
env:
362-
RUSTFLAGS: "" # remove -Dwarnings
363-
- name: "pin once_cell version"
364-
run: cargo update -p once_cell --precise 1.14.0
365352
- name: "check --workspace --all-features"
366353
run: cargo check --workspace --all-features
367354
env:

Cargo.lock

+291
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tokio/Cargo.toml

-3
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,6 @@ features = [
135135
"Win32_Security_Authorization",
136136
]
137137

138-
[target.'cfg(windows)'.dev-dependencies.ntapi]
139-
version = "0.3.6"
140-
141138
[dev-dependencies]
142139
tokio-test = { version = "0.4.0", path = "../tokio-test" }
143140
tokio-stream = { version = "0.1", path = "../tokio-stream" }

0 commit comments

Comments
 (0)