From f90ac8fff9fd5c1e16eaeb23b84f30d8ee6ff085 Mon Sep 17 00:00:00 2001 From: rami3l Date: Fri, 12 Jul 2024 17:00:37 +0800 Subject: [PATCH 1/3] ci(gen-workflows): remove `--quiet` from `git diff` Co-authored-by: Samuel Moelius <35515885+smoelius@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- ci/actions-templates/centos-fmt-clippy-template.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8a2e81d8d4..f8ceb07fb1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1349,7 +1349,7 @@ jobs: - name: Run CI workflow generation checks run: | ./ci/actions-templates/gen-workflows.sh - git diff --quiet + git diff --exit-code - name: Prep cargo dirs run: | mkdir -p ~/.cargo/{registry,git} diff --git a/ci/actions-templates/centos-fmt-clippy-template.yaml b/ci/actions-templates/centos-fmt-clippy-template.yaml index 45cc83ff31..e58c7dba2a 100644 --- a/ci/actions-templates/centos-fmt-clippy-template.yaml +++ b/ci/actions-templates/centos-fmt-clippy-template.yaml @@ -22,7 +22,7 @@ jobs: # skip-all - name: Run CI workflow generation checks run: | ./ci/actions-templates/gen-workflows.sh - git diff --quiet + git diff --exit-code - name: Prep cargo dirs run: | mkdir -p ~/.cargo/{registry,git} From cd24737470a17abd67986d250d5e07ddd58714a6 Mon Sep 17 00:00:00 2001 From: rami3l Date: Fri, 12 Jul 2024 16:56:56 +0800 Subject: [PATCH 2/3] style: reformat all TOMLs with `taplo` --- .cargo/config.toml | 1 - .taplo.toml | 13 +++ Cargo.toml | 50 ++++----- .../tests/channel-rust-nightly-example.toml | 105 +++++++++--------- .../rustup_check_cmd_help_flag_stdout.toml | 2 +- .../rustup_override_cmd_help_flag_stdout.toml | 2 +- ...verride_cmd_list_cmd_help_flag_stdout.toml | 2 +- ..._self_cmd_update_cmd_help_flag_stdout.toml | 2 +- .../rustup_set_cmd_help_flag_stdout.toml | 2 +- ...active-toolchain_cmd_help_flag_stdout.toml | 2 +- .../rustup_show_cmd_help_flag_stdout.toml | 2 +- ...up_show_cmd_home_cmd_help_flag_stdout.toml | 2 +- ...show_cmd_profile_cmd_help_flag_stdout.toml | 2 +- .../rustup_target_cmd_help_flag_stdout.toml | 2 +- ...rustup_toolchain_cmd_help_flag_stdout.toml | 2 +- ...olchain_cmd_list_cmd_help_flag_stdout.toml | 2 +- ...in_cmd_uninstall_cmd_help_flag_stdout.toml | 2 +- .../rustup_up_cmd_help_flag_stdout.toml | 2 +- .../rustup_update_cmd_help_flag_stdout.toml | 2 +- .../rustup_upgrade_cmd_help_flag_stdout.toml | 2 +- triagebot.toml | 14 ++- 21 files changed, 117 insertions(+), 98 deletions(-) create mode 100644 .taplo.toml diff --git a/.cargo/config.toml b/.cargo/config.toml index 610dd9189f..f229a1ae50 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,3 +1,2 @@ [alias] dev-install = "run -- --no-modify-path -y" - diff --git a/.taplo.toml b/.taplo.toml new file mode 100644 index 0000000000..ee5d9465e9 --- /dev/null +++ b/.taplo.toml @@ -0,0 +1,13 @@ +include = ["**/*.toml"] + +[[rule]] +include = ["**/Cargo.toml"] +keys = [ + "dependencies", + "dev-dependencies", + "build-dependencies", + "workspace.dependencies", +] + +[rule.formatting] +column_width = 160 diff --git a/Cargo.toml b/Cargo.toml index 8c992eb2d5..9af419716b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,10 +13,10 @@ build = "build.rs" [features] curl-backend = ["download/curl-backend"] default = [ - "curl-backend", - "reqwest-backend", - "reqwest-native-tls", - "reqwest-rustls-tls", + "curl-backend", + "reqwest-backend", + "reqwest-native-tls", + "reqwest-rustls-tls", ] reqwest-backend = ["download/reqwest-backend"] @@ -30,10 +30,10 @@ no-self-update = [] # Include an Opentelemetry sink for tracing events otel = [ - "dep:opentelemetry-otlp", - "dep:tracing-opentelemetry", - "dep:opentelemetry", - "dep:opentelemetry_sdk", + "dep:opentelemetry-otlp", + "dep:tracing-opentelemetry", + "dep:opentelemetry", + "dep:opentelemetry_sdk", ] # Exports code dependent on private interfaces for the integration test suite @@ -61,8 +61,8 @@ opener = "0.7.0" # allows controlling the vendoring status without exposing the presence of the download crate. openssl = { version = "0.10", optional = true } opentelemetry = { workspace = true, optional = true } -opentelemetry_sdk = { workspace = true, optional = true } opentelemetry-otlp = { workspace = true, optional = true } +opentelemetry_sdk = { workspace = true, optional = true } pulldown-cmark = { version = "0.11", default-features = false } rand = "0.8" regex = "1" @@ -81,13 +81,13 @@ tempfile.workspace = true termcolor.workspace = true thiserror.workspace = true threadpool = "1" -tokio-retry.workspace = true tokio.workspace = true +tokio-retry.workspace = true tokio-stream.workspace = true toml = "0.8" +tracing.workspace = true tracing-opentelemetry = { workspace = true, optional = true } tracing-subscriber = { workspace = true, features = ["env-filter"] } -tracing.workspace = true url.workspace = true wait-timeout = "0.2" walkdir = { workspace = true, optional = true } @@ -100,19 +100,19 @@ winreg = "0.52" [target."cfg(windows)".dependencies.windows-sys] features = [ - "Win32_Foundation", - "Win32_Security", - "Win32_Storage_FileSystem", - "Win32_System_Diagnostics_ToolHelp", - "Win32_System_IO", - "Win32_System_Ioctl", - "Win32_System_JobObjects", - "Win32_System_Kernel", - "Win32_System_LibraryLoader", - "Win32_System_SystemInformation", - "Win32_System_SystemServices", - "Win32_System_Threading", - "Win32_System_WindowsProgramming", + "Win32_Foundation", + "Win32_Security", + "Win32_Storage_FileSystem", + "Win32_System_Diagnostics_ToolHelp", + "Win32_System_IO", + "Win32_System_Ioctl", + "Win32_System_JobObjects", + "Win32_System_Kernel", + "Win32_System_LibraryLoader", + "Win32_System_SystemInformation", + "Win32_System_SystemServices", + "Win32_System_Threading", + "Win32_System_WindowsProgramming", ] version = "0.52.0" @@ -136,8 +136,8 @@ anyhow = "1.0.69" fs_at = "0.1.6" once_cell = "1.18.0" opentelemetry = "0.23" -opentelemetry_sdk = { version = "0.23", features = ["rt-tokio"] } opentelemetry-otlp = "0.16" +opentelemetry_sdk = { version = "0.23", features = ["rt-tokio"] } platforms = "3.4" proptest = "1.1.0" tempfile = "3.8" diff --git a/src/dist/manifest/tests/channel-rust-nightly-example.toml b/src/dist/manifest/tests/channel-rust-nightly-example.toml index bc78c28623..86297b5ab7 100644 --- a/src/dist/manifest/tests/channel-rust-nightly-example.toml +++ b/src/dist/manifest/tests/channel-rust-nightly-example.toml @@ -1,60 +1,59 @@ manifest-version = "2" date = "2015-10-10" [pkg.rust] - version = "rustc 1.3.0 (9a92aaf19 2015-09-15)" - [pkg.rust.target.x86_64-unknown-linux-gnu] - available = true - url = "example.com" - hash = "..." - [[pkg.rust.target.x86_64-unknown-linux-gnu.components]] - pkg = "rustc" - target = "x86_64-unknown-linux-gnu" - [[pkg.rust.target.x86_64-unknown-linux-gnu.components]] - pkg = "rust-docs" - target = "x86_64-unknown-linux-gnu" - [[pkg.rust.target.x86_64-unknown-linux-gnu.components]] - pkg = "cargo" - target = "x86_64-unknown-linux-gnu" - [[pkg.rust.target.x86_64-unknown-linux-gnu.components]] - pkg = "rust-std" - target = "x86_64-unknown-linux-gnu" - # extensions are rust-std or rust-docs that aren't in the rust tarball's component list - [[pkg.rust.target.x86_64-unknown-linux-gnu.extensions]] - pkg = "rust-std" - target = "x86_64-unknown-linux-musl" - [[pkg.rust.target.x86_64-unknown-linux-gnu.extensions]] - pkg = "rust-std" - target = "i686-unknown-linux-gnu" +version = "rustc 1.3.0 (9a92aaf19 2015-09-15)" +[pkg.rust.target.x86_64-unknown-linux-gnu] +available = true +url = "example.com" +hash = "..." +[[pkg.rust.target.x86_64-unknown-linux-gnu.components]] +pkg = "rustc" +target = "x86_64-unknown-linux-gnu" +[[pkg.rust.target.x86_64-unknown-linux-gnu.components]] +pkg = "rust-docs" +target = "x86_64-unknown-linux-gnu" +[[pkg.rust.target.x86_64-unknown-linux-gnu.components]] +pkg = "cargo" +target = "x86_64-unknown-linux-gnu" +[[pkg.rust.target.x86_64-unknown-linux-gnu.components]] +pkg = "rust-std" +target = "x86_64-unknown-linux-gnu" +# extensions are rust-std or rust-docs that aren't in the rust tarball's component list +[[pkg.rust.target.x86_64-unknown-linux-gnu.extensions]] +pkg = "rust-std" +target = "x86_64-unknown-linux-musl" +[[pkg.rust.target.x86_64-unknown-linux-gnu.extensions]] +pkg = "rust-std" +target = "i686-unknown-linux-gnu" [pkg.rustc] - version = "rustc 1.3.0 (9a92aaf19 2015-09-15)" - [pkg.rustc.target.x86_64-unknown-linux-gnu] - available = true - url = "example.com" - hash = "..." +version = "rustc 1.3.0 (9a92aaf19 2015-09-15)" +[pkg.rustc.target.x86_64-unknown-linux-gnu] +available = true +url = "example.com" +hash = "..." [pkg.cargo] - version = "cargo 0.4.0-nightly (553b363 2015-08-03)" - [pkg.cargo.target.x86_64-unknown-linux-gnu] - available = true - url = "example.com" - hash = "..." +version = "cargo 0.4.0-nightly (553b363 2015-08-03)" +[pkg.cargo.target.x86_64-unknown-linux-gnu] +available = true +url = "example.com" +hash = "..." [pkg.rust-std] - version = "rustc 1.3.0 (9a92aaf19 2015-09-15)" - [pkg.rust-std.target.x86_64-unknown-linux-gnu] - available = true - url = "example.com" - hash = "..." - [pkg.rust-std.target.x86_64-unknown-linux-musl] - available = true - url = "example.com" - hash = "..." - [pkg.rust-std.target.i686-unknown-linux-gnu] - available = true - url = "example.com" - hash = "..." +version = "rustc 1.3.0 (9a92aaf19 2015-09-15)" +[pkg.rust-std.target.x86_64-unknown-linux-gnu] +available = true +url = "example.com" +hash = "..." +[pkg.rust-std.target.x86_64-unknown-linux-musl] +available = true +url = "example.com" +hash = "..." +[pkg.rust-std.target.i686-unknown-linux-gnu] +available = true +url = "example.com" +hash = "..." [pkg.rust-docs] - version = "rustc 1.3.0 (9a92aaf19 2015-09-15)" - [pkg.rust-docs.target.x86_64-unknown-linux-gnu] - available = true - url = "example.com" - hash = "..." - +version = "rustc 1.3.0 (9a92aaf19 2015-09-15)" +[pkg.rust-docs.target.x86_64-unknown-linux-gnu] +available = true +url = "example.com" +hash = "..." diff --git a/tests/suite/cli-ui/rustup/rustup_check_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_check_cmd_help_flag_stdout.toml index 86cc59070b..2ff2f744e5 100644 --- a/tests/suite/cli-ui/rustup/rustup_check_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_check_cmd_help_flag_stdout.toml @@ -1,5 +1,5 @@ bin.name = "rustup" -args = ["check","--help"] +args = ["check", "--help"] stdout = """ ... Check for updates to Rust toolchains and rustup diff --git a/tests/suite/cli-ui/rustup/rustup_override_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_override_cmd_help_flag_stdout.toml index 27bc0713a4..66546023a0 100644 --- a/tests/suite/cli-ui/rustup/rustup_override_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_override_cmd_help_flag_stdout.toml @@ -1,5 +1,5 @@ bin.name = "rustup" -args = ["override","--help"] +args = ["override", "--help"] stdout = """ ... Modify toolchain overrides for directories diff --git a/tests/suite/cli-ui/rustup/rustup_override_cmd_list_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_override_cmd_list_cmd_help_flag_stdout.toml index 8d90aca23e..1a1e735367 100644 --- a/tests/suite/cli-ui/rustup/rustup_override_cmd_list_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_override_cmd_list_cmd_help_flag_stdout.toml @@ -1,5 +1,5 @@ bin.name = "rustup" -args = ["override","list","--help"] +args = ["override", "list", "--help"] stdout = """ ... List directory toolchain overrides diff --git a/tests/suite/cli-ui/rustup/rustup_self_cmd_update_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_self_cmd_update_cmd_help_flag_stdout.toml index e5472f2783..90ffe32d71 100644 --- a/tests/suite/cli-ui/rustup/rustup_self_cmd_update_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_self_cmd_update_cmd_help_flag_stdout.toml @@ -1,5 +1,5 @@ bin.name = "rustup" -args = ["self","update","--help"] +args = ["self", "update", "--help"] stdout = """ ... Download and install updates to rustup diff --git a/tests/suite/cli-ui/rustup/rustup_set_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_set_cmd_help_flag_stdout.toml index 3d5ffe91f5..938b8ab0d3 100644 --- a/tests/suite/cli-ui/rustup/rustup_set_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_set_cmd_help_flag_stdout.toml @@ -1,5 +1,5 @@ bin.name = "rustup" -args = ["set","--help"] +args = ["set", "--help"] stdout = """ ... Alter rustup settings diff --git a/tests/suite/cli-ui/rustup/rustup_show_cmd_active-toolchain_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_show_cmd_active-toolchain_cmd_help_flag_stdout.toml index 006f8e3f7f..d06aab867e 100644 --- a/tests/suite/cli-ui/rustup/rustup_show_cmd_active-toolchain_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_show_cmd_active-toolchain_cmd_help_flag_stdout.toml @@ -1,5 +1,5 @@ bin.name = "rustup" -args = ["show","active-toolchain","--help"] +args = ["show", "active-toolchain", "--help"] stdout = """ ... Show the active toolchain diff --git a/tests/suite/cli-ui/rustup/rustup_show_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_show_cmd_help_flag_stdout.toml index 4291fc5a33..6f2e81e48e 100644 --- a/tests/suite/cli-ui/rustup/rustup_show_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_show_cmd_help_flag_stdout.toml @@ -1,5 +1,5 @@ bin.name = "rustup" -args = ["show","--help"] +args = ["show", "--help"] stdout = """ ... Show the active and installed toolchains or profiles diff --git a/tests/suite/cli-ui/rustup/rustup_show_cmd_home_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_show_cmd_home_cmd_help_flag_stdout.toml index b98cb165c3..6283c5e97a 100644 --- a/tests/suite/cli-ui/rustup/rustup_show_cmd_home_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_show_cmd_home_cmd_help_flag_stdout.toml @@ -1,5 +1,5 @@ bin.name = "rustup" -args = ["show","home","--help"] +args = ["show", "home", "--help"] stdout = """ ... Display the computed value of RUSTUP_HOME diff --git a/tests/suite/cli-ui/rustup/rustup_show_cmd_profile_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_show_cmd_profile_cmd_help_flag_stdout.toml index b0449e2670..e814a1f9c3 100644 --- a/tests/suite/cli-ui/rustup/rustup_show_cmd_profile_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_show_cmd_profile_cmd_help_flag_stdout.toml @@ -1,5 +1,5 @@ bin.name = "rustup" -args = ["show","profile","--help"] +args = ["show", "profile", "--help"] stdout = """ ... Show the default profile used for the `rustup install` command diff --git a/tests/suite/cli-ui/rustup/rustup_target_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_target_cmd_help_flag_stdout.toml index a1b723e37c..c5ed7dca27 100644 --- a/tests/suite/cli-ui/rustup/rustup_target_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_target_cmd_help_flag_stdout.toml @@ -1,5 +1,5 @@ bin.name = "rustup" -args = ["target","--help"] +args = ["target", "--help"] stdout = """ ... Modify a toolchain's supported targets diff --git a/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_help_flag_stdout.toml index 87bcb893b6..9485b6323b 100644 --- a/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_help_flag_stdout.toml @@ -1,5 +1,5 @@ bin.name = "rustup" -args = ["toolchain","--help"] +args = ["toolchain", "--help"] stdout = """ ... Modify or query the installed toolchains diff --git a/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_list_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_list_cmd_help_flag_stdout.toml index 8669885d01..ea6eff1bfd 100644 --- a/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_list_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_list_cmd_help_flag_stdout.toml @@ -1,5 +1,5 @@ bin.name = "rustup" -args = ["toolchain","list","--help"] +args = ["toolchain", "list", "--help"] stdout = """ ... List installed toolchains diff --git a/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_uninstall_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_uninstall_cmd_help_flag_stdout.toml index d79a2a2015..42be34c34a 100644 --- a/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_uninstall_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_uninstall_cmd_help_flag_stdout.toml @@ -1,5 +1,5 @@ bin.name = "rustup" -args = ["toolchain","uninstall","--help"] +args = ["toolchain", "uninstall", "--help"] stdout = """ ... Uninstall a toolchain diff --git a/tests/suite/cli-ui/rustup/rustup_up_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_up_cmd_help_flag_stdout.toml index 58aa50511e..2710d20a55 100644 --- a/tests/suite/cli-ui/rustup/rustup_up_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_up_cmd_help_flag_stdout.toml @@ -1,5 +1,5 @@ bin.name = "rustup" -args = ["up","--help"] +args = ["up", "--help"] stdout = """ ... Update Rust toolchains and rustup diff --git a/tests/suite/cli-ui/rustup/rustup_update_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_update_cmd_help_flag_stdout.toml index 59294d8dca..ce1a69e5fd 100644 --- a/tests/suite/cli-ui/rustup/rustup_update_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_update_cmd_help_flag_stdout.toml @@ -1,5 +1,5 @@ bin.name = "rustup" -args = ["update","--help"] +args = ["update", "--help"] stdout = """ ... Update Rust toolchains and rustup diff --git a/tests/suite/cli-ui/rustup/rustup_upgrade_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_upgrade_cmd_help_flag_stdout.toml index 94d10f9f44..1c91e425a5 100644 --- a/tests/suite/cli-ui/rustup/rustup_upgrade_cmd_help_flag_stdout.toml +++ b/tests/suite/cli-ui/rustup/rustup_upgrade_cmd_help_flag_stdout.toml @@ -1,5 +1,5 @@ bin.name = "rustup" -args = ["upgrade","--help"] +args = ["upgrade", "--help"] stdout = """ ... Update Rust toolchains and rustup diff --git a/triagebot.toml b/triagebot.toml index 1bbac476e9..b70ca8996f 100644 --- a/triagebot.toml +++ b/triagebot.toml @@ -1,9 +1,17 @@ [relabel] allow-unauthenticated = [ - "bug", "duplicate", "enhancement", "forwarded", - "performance", "question", "security", "tracking", "website", - "O-*", "A-*" + "bug", + "duplicate", + "enhancement", + "forwarded", + "performance", + "question", + "security", + "tracking", + "website", + "O-*", + "A-*", ] [assign] From 827e656d156552b9c7403a614fa11ac38187999f Mon Sep 17 00:00:00 2001 From: rami3l Date: Fri, 12 Jul 2024 17:09:37 +0800 Subject: [PATCH 3/3] ci(check): add `taplo fmt` test for TOMLs --- .github/workflows/ci.yaml | 10 +++++++++- ci/actions-templates/centos-fmt-clippy-template.yaml | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f8ceb07fb1..3a8d7911dd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1392,7 +1392,15 @@ jobs: shellcheck -x -s dash -- rustup-init.sh git ls-files -- '*.sh' | xargs shellcheck -x -s dash git ls-files -- '*.bash' | xargs shellcheck -x -s bash - - name: Run formatting checks + - name: Install taplo + uses: taiki-e/install-action@v2 + with: + tool: taplo-cli@0.8 + - name: Run TOML formatting checks + run: | + taplo fmt + git diff --exit-code + - name: Run Rust formatting checks run: | cargo fmt --all --check - name: Run cargo check and clippy diff --git a/ci/actions-templates/centos-fmt-clippy-template.yaml b/ci/actions-templates/centos-fmt-clippy-template.yaml index e58c7dba2a..635edf2ac2 100644 --- a/ci/actions-templates/centos-fmt-clippy-template.yaml +++ b/ci/actions-templates/centos-fmt-clippy-template.yaml @@ -65,7 +65,15 @@ jobs: # skip-all shellcheck -x -s dash -- rustup-init.sh git ls-files -- '*.sh' | xargs shellcheck -x -s dash git ls-files -- '*.bash' | xargs shellcheck -x -s bash - - name: Run formatting checks + - name: Install taplo + uses: taiki-e/install-action@v2 + with: + tool: taplo-cli@0.8 + - name: Run TOML formatting checks + run: | + taplo fmt + git diff --exit-code + - name: Run Rust formatting checks run: | cargo fmt --all --check - name: Run cargo check and clippy