tokio-rs/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2026-09-08 00:00:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

ci: remove uses of unmaintained actions-rs actions (#5316)

Browse Source 
- Use dtolnay/rust-toolchain instead of actions-rs/toolchain
- Use cargo/cross directly instead of actions-rs/cargo
- Use rustsec/audit-check instead of actions-rs/audit-check
This commit is contained in:
Taiki Endo
2022-12-28 00:06:56 +09:00
committed by GitHub
parent 682e93df93
commit 519afd4458
5 changed files with 38 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/audit.yml
+4 -3
View File
@@ -15,15 +15,16 @@ permissions:
jobs: jobs:
security-audit: security-audit:
permissions: permissions:
checks: write # for actions-rs/audit-check to create check checks: write # for rustsec/audit-check to create check
contents: read # for actions/checkout to fetch code contents: read # for actions/checkout to fetch code
issues: write # for actions-rs/audit-check to create issues issues: write # for rustsec/audit-check to create issues
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, 'ci skip')" if: "!contains(github.event.head_commit.message, 'ci skip')"
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Audit Check - name: Audit Check
uses: actions-rs/audit-check@v1 # https://github.com/rustsec/audit-check/issues/2
uses: rustsec/audit-check@master
with: with:
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
.github/workflows/ci.yml
+29 -58
View File
@@ -73,10 +73,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install Rust ${{ env.rust_stable }} - name: Install Rust ${{ env.rust_stable }}
uses: actions-rs/toolchain@v1 uses: dtolnay/rust-toolchain@master
with: with:
toolchain: ${{ env.rust_stable }} toolchain: ${{ env.rust_stable }}
override: true
- name: Install Rust - name: Install Rust
run: rustup update stable run: rustup update stable
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
@@ -123,10 +122,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install Rust ${{ env.rust_stable }} - name: Install Rust ${{ env.rust_stable }}
uses: actions-rs/toolchain@v1 uses: dtolnay/rust-toolchain@master
with: with:
toolchain: ${{ env.rust_stable }} toolchain: ${{ env.rust_stable }}
override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
- name: Enable parking_lot send_guard feature - name: Enable parking_lot send_guard feature
# Inserts the line "plsend = ["parking_lot/send_guard"]" right after [features] # Inserts the line "plsend = ["parking_lot/send_guard"]" right after [features]
@@ -140,10 +138,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install Rust ${{ env.rust_stable }} - name: Install Rust ${{ env.rust_stable }}
uses: actions-rs/toolchain@v1 uses: dtolnay/rust-toolchain@master
with: with:
toolchain: ${{ env.rust_stable }} toolchain: ${{ env.rust_stable }}
override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
- name: Install Valgrind - name: Install Valgrind
@@ -179,10 +176,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install Rust ${{ env.rust_stable }} - name: Install Rust ${{ env.rust_stable }}
uses: actions-rs/toolchain@v1 uses: dtolnay/rust-toolchain@master
with: with:
toolchain: ${{ env.rust_stable }} toolchain: ${{ env.rust_stable }}
override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
# Run `tokio` with "unstable" cfg flag. # Run `tokio` with "unstable" cfg flag.
- name: test tokio full --cfg unstable - name: test tokio full --cfg unstable
@@ -200,11 +196,10 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install Rust ${{ env.rust_nightly }} - name: Install Rust ${{ env.rust_nightly }}
uses: actions-rs/toolchain@v1 uses: dtolnay/rust-toolchain@master
with: with:
toolchain: ${{ env.rust_nightly }} toolchain: ${{ env.rust_nightly }}
components: miri components: miri
override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
- name: miri - name: miri
# Many of tests in tokio/tests and doctests use #[tokio::test] or # Many of tests in tokio/tests and doctests use #[tokio::test] or
@@ -224,10 +219,9 @@ jobs:
# Required to resolve symbols in sanitizer output # Required to resolve symbols in sanitizer output
run: sudo apt-get install -y llvm run: sudo apt-get install -y llvm
- name: Install Rust ${{ env.rust_nightly }} - name: Install Rust ${{ env.rust_nightly }}
uses: actions-rs/toolchain@v1 uses: dtolnay/rust-toolchain@master
with: with:
toolchain: ${{ env.rust_nightly }} toolchain: ${{ env.rust_nightly }}
override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
- name: asan - name: asan
run: cargo test --workspace --all-features --target x86_64-unknown-linux-gnu --tests -- --test-threads 1 run: cargo test --workspace --all-features --target x86_64-unknown-linux-gnu --tests -- --test-threads 1
@@ -250,16 +244,13 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install Rust ${{ env.rust_stable }} - name: Install Rust ${{ env.rust_stable }}
uses: actions-rs/toolchain@v1 uses: dtolnay/rust-toolchain@master
with: with:
toolchain: ${{ env.rust_stable }} toolchain: ${{ env.rust_stable }}
target: ${{ matrix.target }} target: ${{ matrix.target }}
override: true - name: Install cross
- uses: actions-rs/cargo@v1 uses: taiki-e/install-action@cross
with: - run: cross check --workspace --all-features --target ${{ matrix.target }}
use-cross: true
command: check
args: --workspace --all-features --target ${{ matrix.target }}
env: env:
RUSTFLAGS: --cfg tokio_unstable -Dwarnings RUSTFLAGS: --cfg tokio_unstable -Dwarnings
@@ -280,28 +271,21 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install Rust stable - name: Install Rust stable
uses: actions-rs/toolchain@v1 uses: dtolnay/rust-toolchain@master
with: with:
toolchain: ${{ env.rust_stable }} toolchain: ${{ env.rust_stable }}
target: ${{ matrix.target }} target: ${{ matrix.target }}
override: true - name: Install cross
uses: taiki-e/install-action@cross
# First run with all features (including parking_lot) # First run with all features (including parking_lot)
- uses: actions-rs/cargo@v1 - run: cross test -p tokio --all-features --target ${{ matrix.target }} --tests
with:
use-cross: true
command: test
args: -p tokio --all-features --target ${{ matrix.target }} --tests
env: env:
RUSTFLAGS: --cfg tokio_unstable -Dwarnings --cfg tokio_no_ipv6 ${{ matrix.rustflags }} RUSTFLAGS: --cfg tokio_unstable -Dwarnings --cfg tokio_no_ipv6 ${{ matrix.rustflags }}
# Now run without parking_lot # Now run without parking_lot
- name: Remove `parking_lot` from `full` feature - name: Remove `parking_lot` from `full` feature
run: sed -i '0,/parking_lot/{/parking_lot/d;}' tokio/Cargo.toml run: sed -i '0,/parking_lot/{/parking_lot/d;}' tokio/Cargo.toml
- uses: actions-rs/cargo@v1 # The `tokio_no_parking_lot` cfg is here to ensure the `sed` above does not silently break.
with: - run: cross test -p tokio --features full,test-util --target ${{ matrix.target }} --tests
use-cross: true
command: test
# The `tokio_no_parking_lot` cfg is here to ensure the `sed` above does not silently break.
args: -p tokio --features full,test-util --target ${{ matrix.target }} --tests
env: env:
RUSTFLAGS: --cfg tokio_unstable -Dwarnings --cfg tokio_no_ipv6 --cfg tokio_no_parking_lot ${{ matrix.rustflags }} RUSTFLAGS: --cfg tokio_unstable -Dwarnings --cfg tokio_no_ipv6 --cfg tokio_no_parking_lot ${{ matrix.rustflags }}
@@ -312,11 +296,10 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install Rust ${{ env.rust_nightly }} - name: Install Rust ${{ env.rust_nightly }}
uses: actions-rs/toolchain@v1 uses: dtolnay/rust-toolchain@master
with: with:
toolchain: ${{ env.rust_nightly }} toolchain: ${{ env.rust_nightly }}
components: rust-src components: rust-src
override: true
# Install linker and libraries for i686-unknown-linux-gnu # Install linker and libraries for i686-unknown-linux-gnu
- uses: taiki-e/setup-cross-toolchain-action@v1 - uses: taiki-e/setup-cross-toolchain-action@v1
with: with:
@@ -331,11 +314,10 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install Rust ${{ env.rust_nightly }} - name: Install Rust ${{ env.rust_nightly }}
uses: actions-rs/toolchain@v1 uses: dtolnay/rust-toolchain@master
with: with:
toolchain: ${{ env.rust_nightly }} toolchain: ${{ env.rust_nightly }}
target: ${{ matrix.target }} target: ${{ matrix.target }}
override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
- name: Install cargo-hack - name: Install cargo-hack
uses: taiki-e/install-action@cargo-hack uses: taiki-e/install-action@cargo-hack
@@ -353,10 +335,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install Rust ${{ env.rust_min }} - name: Install Rust ${{ env.rust_min }}
uses: actions-rs/toolchain@v1 uses: dtolnay/rust-toolchain@master
with: with:
toolchain: ${{ env.rust_min }} toolchain: ${{ env.rust_min }}
override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
# First compile just the main tokio crate with minrust and newest version # First compile just the main tokio crate with minrust and newest version
# of all dependencies, then pin once_cell and compile the rest of the # of all dependencies, then pin once_cell and compile the rest of the
@@ -378,10 +359,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install Rust ${{ env.rust_nightly }} - name: Install Rust ${{ env.rust_nightly }}
uses: actions-rs/toolchain@v1 uses: dtolnay/rust-toolchain@master
with: with:
toolchain: ${{ env.rust_nightly }} toolchain: ${{ env.rust_nightly }}
override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
- name: Install cargo-hack - name: Install cargo-hack
uses: taiki-e/install-action@cargo-hack uses: taiki-e/install-action@cargo-hack
@@ -410,10 +390,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install Rust ${{ env.rust_stable }} - name: Install Rust ${{ env.rust_stable }}
uses: actions-rs/toolchain@v1 uses: dtolnay/rust-toolchain@master
with: with:
toolchain: ${{ env.rust_stable }} toolchain: ${{ env.rust_stable }}
override: true
components: rustfmt components: rustfmt
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
# Check fmt # Check fmt
@@ -431,10 +410,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install Rust ${{ env.rust_clippy }} - name: Install Rust ${{ env.rust_clippy }}
uses: actions-rs/toolchain@v1 uses: dtolnay/rust-toolchain@master
with: with:
toolchain: ${{ env.rust_clippy }} toolchain: ${{ env.rust_clippy }}
override: true
components: clippy components: clippy
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
# Run clippy # Run clippy
@@ -447,10 +425,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install Rust ${{ env.rust_nightly }} - name: Install Rust ${{ env.rust_nightly }}
uses: actions-rs/toolchain@v1 uses: dtolnay/rust-toolchain@master
with: with:
toolchain: ${{ env.rust_nightly }} toolchain: ${{ env.rust_nightly }}
override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
- name: "doc --lib --all-features" - name: "doc --lib --all-features"
run: cargo doc --lib --no-deps --all-features --document-private-items run: cargo doc --lib --no-deps --all-features --document-private-items
@@ -464,10 +441,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install Rust ${{ env.rust_stable }} - name: Install Rust ${{ env.rust_stable }}
uses: actions-rs/toolchain@v1 uses: dtolnay/rust-toolchain@master
with: with:
toolchain: ${{ env.rust_stable }} toolchain: ${{ env.rust_stable }}
override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
- name: build --cfg loom - name: build --cfg loom
run: cargo test --no-run --lib --features full run: cargo test --no-run --lib --features full
@@ -499,10 +475,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install Rust ${{ env.rust_stable }} - name: Install Rust ${{ env.rust_stable }}
uses: actions-rs/toolchain@v1 uses: dtolnay/rust-toolchain@master
with: with:
toolchain: ${{ env.rust_stable }} toolchain: ${{ env.rust_stable }}
override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
- name: Test hyper - name: Test hyper
run: | run: |
@@ -527,11 +502,10 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install Rust ${{ env.rust_nightly }} - name: Install Rust ${{ env.rust_nightly }}
uses: actions-rs/toolchain@v1 uses: dtolnay/rust-toolchain@master
with: with:
toolchain: ${{ env.rust_nightly }} toolchain: ${{ env.rust_nightly }}
target: x86_64-fortanix-unknown-sgx target: x86_64-fortanix-unknown-sgx
override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
# NOTE: Currently the only test we can run is to build tokio with rt and sync features. # NOTE: Currently the only test we can run is to build tokio with rt and sync features.
- name: build tokio - name: build tokio
@@ -544,10 +518,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install Rust ${{ env.rust_stable }} - name: Install Rust ${{ env.rust_stable }}
uses: actions-rs/toolchain@v1 uses: dtolnay/rust-toolchain@master
with: with:
toolchain: ${{ env.rust_stable }} toolchain: ${{ env.rust_stable }}
override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
- name: Install wasm-pack - name: Install wasm-pack
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
@@ -561,10 +534,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install Rust ${{ env.rust_stable }} - name: Install Rust ${{ env.rust_stable }}
uses: actions-rs/toolchain@v1 uses: dtolnay/rust-toolchain@master
with: with:
toolchain: ${{ env.rust_stable }} toolchain: ${{ env.rust_stable }}
override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
# Install dependencies # Install dependencies
@@ -614,12 +586,11 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install Rust nightly-2022-07-25 - name: Install Rust nightly-2022-07-25
uses: actions-rs/toolchain@v1 uses: dtolnay/rust-toolchain@master
with: with:
# `check-external-types` requires a specific Rust nightly version. See # `check-external-types` requires a specific Rust nightly version. See
# the README for details: https://github.com/awslabs/cargo-check-external-types # the README for details: https://github.com/awslabs/cargo-check-external-types
toolchain: nightly-2022-07-25 toolchain: nightly-2022-07-25
override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
- name: check-external-types - name: check-external-types
run: | run: |
.github/workflows/loom.yml
+1 -2
View File
@@ -34,10 +34,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install Rust ${{ env.rust_stable }} - name: Install Rust ${{ env.rust_stable }}
uses: actions-rs/toolchain@v1 uses: dtolnay/rust-toolchain@master
with: with:
toolchain: ${{ env.rust_stable }} toolchain: ${{ env.rust_stable }}
override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
- name: loom ${{ matrix.scope }} - name: loom ${{ matrix.scope }}
run: cargo test --lib --release --features full -- --nocapture $SCOPE run: cargo test --lib --release --features full -- --nocapture $SCOPE
.github/workflows/pr-audit.yml
+3 -10
View File
@@ -19,17 +19,10 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install cargo-audit - name: Install cargo-audit
uses: actions-rs/cargo@v1 run: cargo install cargo-audit
with:
command: install
args: cargo-audit
- name: Generate lockfile - name: Generate lockfile
uses: actions-rs/cargo@v1 run: cargo generate-lockfile
with:
command: generate-lockfile
- name: Audit dependencies - name: Audit dependencies
uses: actions-rs/cargo@v1 run: cargo audit
with:
command: audit
.github/workflows/stress-test.yml
+1 -2
View File
@@ -25,10 +25,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install Rust ${{ env.rust_stable }} - name: Install Rust ${{ env.rust_stable }}
uses: actions-rs/toolchain@v1 uses: dtolnay/rust-toolchain@master
with: with:
toolchain: ${{ env.rust_stable }} toolchain: ${{ env.rust_stable }}
override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
- name: Install Valgrind - name: Install Valgrind
uses: taiki-e/install-action@valgrind uses: taiki-e/install-action@valgrind