Skip to content

Commit

Permalink
ci: fix ci on tokio-1.20.x (#5999)
Browse files Browse the repository at this point in the history
  • Loading branch information
maminrayej authored Sep 18, 2023
1 parent edd172c commit 98bb3be
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 8 deletions.
23 changes: 15 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@ jobs:
run: rustup update stable
- uses: Swatinem/rust-cache@v1
- name: Install cargo-hack
run: cargo install cargo-hack --version 0.5.26
uses: taiki-e/install-action@v2
with:
tool: cargo-hack

# Run `tokio` with `full` features. This excludes testing utilities which
# can alter the runtime behavior of Tokio.
Expand Down Expand Up @@ -220,7 +222,7 @@ jobs:
with:
toolchain: ${{ env.rust_nightly }}
override: true
- uses: Swatinem/rust-cache@v1
# - uses: Swatinem/rust-cache@v1 -> CI failure observed due to insufficient storage space
- name: asan
run: cargo test --workspace --all-features --target x86_64-unknown-linux-gnu --tests -- --test-threads 1
env:
Expand Down Expand Up @@ -274,7 +276,9 @@ jobs:
override: true
- uses: Swatinem/rust-cache@v1
- name: Install cargo-hack
run: cargo install cargo-hack --version 0.5.26
uses: taiki-e/install-action@v2
with:
tool: cargo-hack
- name: check --each-feature
run: cargo hack check --all --each-feature -Z avoid-dev-deps
# Try with unstable feature flags
Expand Down Expand Up @@ -310,7 +314,9 @@ jobs:
override: true
- uses: Swatinem/rust-cache@v1
- name: Install cargo-hack
run: cargo install cargo-hack --version 0.5.26
uses: taiki-e/install-action@v2
with:
tool: cargo-hack
- name: "check --all-features -Z minimal-versions"
run: |
# Remove dev-dependencies from Cargo.toml to prevent the next `cargo update`
Expand Down Expand Up @@ -408,10 +414,10 @@ jobs:
- macos-latest
steps:
- uses: actions/checkout@v3
- name: Install Rust ${{ env.rust_stable }}
- name: Install Rust 1.65.0
uses: actions-rs/toolchain@v1
with:
toolchain: ${{ env.rust_stable }}
toolchain: 1.65.0
override: true
- uses: Swatinem/rust-cache@v1
- name: Test hyper
Expand Down Expand Up @@ -462,8 +468,9 @@ jobs:

# Install dependencies
- name: Install cargo-hack
run: cargo install cargo-hack

uses: taiki-e/install-action@v2
with:
tool: cargo-hack
- name: Install wasm32-wasi target
run: rustup target add wasm32-wasi

Expand Down
38 changes: 38 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions tokio/src/future/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ cfg_sync! {

cfg_trace! {
mod trace;
#[allow(unused_imports)]
pub(crate) use trace::InstrumentedFuture as Future;
}

Expand Down

0 comments on commit 98bb3be

Please sign in to comment.