diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ef55849..b8b5340 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,19 +25,12 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v3 - - # FIXME: Switch back when actions-rs/toolchain#{209,220,222} is merged - uses: r3-os/actions-rust-toolchain@a862b6623c178b43a3135516442a5f72fb5c1877 + - uses: dtolnay/rust-toolchain@master with: - profile: minimal toolchain: nightly - override: true components: rustfmt - - # FIXME: Switch back when actions-rs/cargo#217 gets merged - uses: r3-os/actions-rust-cargo@fb222fe18dc90e381546d012f9e3d6f353f0f627 - with: - command: fmt - args: --all -- --check + - run: cargo fmt --all -- --check docs_and_spell_check: name: Docs and Spell Check @@ -48,21 +41,12 @@ jobs: steps: - name: Checkout Actions Repository uses: actions/checkout@v3 - - # FIXME: Switch back when actions-rs/toolchain#{209,220,222} is merged - uses: r3-os/actions-rust-toolchain@a862b6623c178b43a3135516442a5f72fb5c1877 - with: - profile: minimal - toolchain: stable - override: true + - uses: dtolnay/rust-toolchain@stable - name: Check spelling uses: crate-ci/typos@master - - # FIXME: Switch back when actions-rs/cargo#217 gets merged - uses: r3-os/actions-rust-cargo@fb222fe18dc90e381546d012f9e3d6f353f0f627 - with: - command: doc - args: --no-deps + - run: cargo doc --no-deps clippy: name: Clippy @@ -70,12 +54,9 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v3 - - # FIXME: Switch back when actions-rs/toolchain#{209,220,222} is merged - uses: r3-os/actions-rust-toolchain@a862b6623c178b43a3135516442a5f72fb5c1877 + - uses: dtolnay/rust-toolchain@master with: - profile: minimal toolchain: nightly - override: true components: clippy - # FIXME: Switch back when actions-rs/cargo#217 gets merged @@ -90,12 +71,9 @@ jobs: timeout-minutes: 20 steps: - uses: actions/checkout@v3 - - # FIXME: Switch back when actions-rs/toolchain#{209,220,222} is merged - uses: r3-os/actions-rust-toolchain@a862b6623c178b43a3135516442a5f72fb5c1877 + - uses: dtolnay/rust-toolchain@master with: - profile: minimal toolchain: nightly - override: true components: llvm-tools-preview - uses: taiki-e/install-action@cargo-llvm-cov @@ -115,12 +93,7 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v3 - - # FIXME: Switch back when actions-rs/toolchain#{209,220,222} is merged - uses: r3-os/actions-rust-toolchain@a862b6623c178b43a3135516442a5f72fb5c1877 - with: - profile: minimal - toolchain: stable - override: true + - uses: dtolnay/rust-toolchain@stable - uses: taiki-e/install-action@nextest - name: 'Build and test' @@ -138,12 +111,7 @@ jobs: run: git config --global core.symlinks true - uses: actions/checkout@v3 - - # FIXME: Switch back when actions-rs/toolchain#{209,220,222} is merged - uses: r3-os/actions-rust-toolchain@a862b6623c178b43a3135516442a5f72fb5c1877 - with: - profile: minimal - toolchain: stable - override: true + - uses: dtolnay/rust-toolchain@stable - uses: taiki-e/install-action@nextest - name: 'Build and test' diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3899bf8..47f7be8 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -22,12 +22,7 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v3 - - # FIXME: Switch back when actions-rs/toolchain#{209,220,222} is merged - uses: r3-os/actions-rust-toolchain@a862b6623c178b43a3135516442a5f72fb5c1877 - with: - profile: minimal - toolchain: stable - override: true + - uses: dtolnay/rust-toolchain@stable - uses: taiki-e/install-action@nextest - name: 'Build and test' @@ -45,12 +40,7 @@ jobs: run: git config --global core.symlinks true - uses: actions/checkout@v3 - - # FIXME: Switch back when actions-rs/toolchain#{209,220,222} is merged - uses: r3-os/actions-rust-toolchain@a862b6623c178b43a3135516442a5f72fb5c1877 - with: - profile: minimal - toolchain: stable - override: true + - uses: dtolnay/rust-toolchain@stable - uses: taiki-e/install-action@nextest - name: 'Build and test' @@ -71,12 +61,7 @@ jobs: timeout-minutes: 25 steps: - uses: actions/checkout@v3 - - # FIXME: Switch back when actions-rs/toolchain#{209,220,222} is merged - uses: r3-os/actions-rust-toolchain@a862b6623c178b43a3135516442a5f72fb5c1877 - with: - profile: minimal - toolchain: stable - override: true + - uses: dtolnay/rust-toolchain@stable - name: workspaces Cache id: workspaces_cache