Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: change rust-toolchain file to toml format #11528

Merged
merged 5 commits into from
Oct 24, 2023
Merged

Conversation

hawkw
Copy link
Contributor

@hawkw hawkw commented Oct 23, 2023

The rust-toolchain file containing only a Rust version number is deprecated in favor of a TOML-formatted rust-toolchain.toml. Using the old format seems to make Dependabot unhappy --- it complains that:

only rust-toolchain files formatted as TOML are supported, the non-TOML
format was deprecated by Rust

Therefore, this branch changes the toolchain file in this repo to the TOML format. This required updating the CI workflows that check that the toolchain matches to use a new regex.

The `rust-toolchain` file containing only a Rust version number is
deprecated in favor of a TOML-formatted `rust-toolchain.toml`. Using the
old format seems to make Dependabot unhappy --- it complains that:

```
only rust-toolchain files formatted as TOML are supported, the non-TOML
format was deprecated by Rust
```

Therefore, this branch changes the toolchain file in this repo to the
TOML format. This required updating the CI workflows that check that
the toolchain matches to use a new regex.
@hawkw hawkw requested a review from a team as a code owner October 23, 2023 18:50
@hawkw hawkw merged commit 020cc6e into main Oct 24, 2023
12 checks passed
@hawkw hawkw deleted the eliza/rust-toolchain.toml branch October 24, 2023 16:29
hawkw added a commit that referenced this pull request Oct 26, 2023
PR #11528 changed the `rust-toolchain` file to use the TOML format
rather than the plaintext format. Unfortunately, this broke the
`test-policy` CI job, which `cat`s the contents of the `rust-toolchain`
file to determine which Rust version to install, and that file now no
longer exists (since it's now in `rust-toolchain.toml`). See:
https://github.com/linkerd/linkerd2/actions/runs/6649430068/job/18068192854?pr=11535

This branch fixes that by changing the CI job to use a regex to extract
the Rust toolchain version instead.
mateiidavid pushed a commit that referenced this pull request Oct 27, 2023
PR #11528 changed the `rust-toolchain` file to use the TOML format
rather than the plaintext format. Unfortunately, this broke the
`test-policy` CI job, which `cat`s the contents of the `rust-toolchain`
file to determine which Rust version to install, and that file now no
longer exists (since it's now in `rust-toolchain.toml`). See:
https://github.com/linkerd/linkerd2/actions/runs/6649430068/job/18068192854?pr=11535

This branch fixes that by changing the CI job to use a regex to extract
the Rust toolchain version instead.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants