From e708f3a6316162dbb7bc8ff465db24fe2dea0249 Mon Sep 17 00:00:00 2001 From: Diva M Date: Tue, 14 Jan 2025 23:18:46 -0500 Subject: [PATCH] fix missed in merge --- .github/workflows/rust.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index f65af015a..7e26a7939 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -188,16 +188,9 @@ jobs: SCCACHE_GHA_ENABLED: "on" steps: - uses: actions/checkout@v4 -<<<<<<< HEAD - uses: mozilla-actions/sccache-action@v0.0.4 - - uses: dtolnay/rust-toolchain@1.70.0 - - run: cargo check --lib --all-features -p iroh-quinn-udp -p iroh-quinn-proto -p iroh-quinn -======= - # Note that we must also update the README when changing the MSRV - uses: dtolnay/rust-toolchain@1.71.0 - - uses: Swatinem/rust-cache@v2 - - run: cargo check --lib --all-features -p quinn-udp -p quinn-proto -p quinn ->>>>>>> 6ee883a2 + - run: cargo check --lib --all-features -p iroh-quinn-udp -p iroh-quinn-proto -p iroh-quinn lint: runs-on: ubuntu-latest