Skip to content

Commit

Permalink
Auto merge of #467 - JustForFun88:remove_cross_toml, r=Amanieu
Browse files Browse the repository at this point in the history
Migrate from `actions-rs/toolchain@v1` to `dtolnay/rust-toolchain@master` and remove `Cross.toml`

This PR replace the usage of [actions-rs/toolchain@v1](https://github.com/actions-rs/toolchain) with [dtolnay/rust-toolchain](https://github.com/dtolnay/rust-toolchain) as it is no longer maintained and uses the deprecated GitHub Actions API. The [dtolnay/rust-toolchain](https://github.com/dtolnay/rust-toolchain) provides similar functionality and also provides some additional features such as colored output.

Regarding the `Cross.toml` file, it is no longer needed after merging rust-lang/rust#115267.
  • Loading branch information
bors committed Aug 31, 2023
2 parents f9e4900 + dcff369 commit ec75914
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 19 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,9 @@ jobs:
needs: basics
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.channel }}
override: true
- env:
TARGET: ${{ matrix.target }}
CHANNEL: ${{ matrix.channel }}
Expand Down
17 changes: 0 additions & 17 deletions Cross.toml

This file was deleted.

0 comments on commit ec75914

Please sign in to comment.