From 7874ba2f401a7fe587178a4641ebe59781f7b463 Mon Sep 17 00:00:00 2001 From: onur-ozkan Date: Fri, 17 Jan 2025 11:20:13 +0300 Subject: [PATCH 1/2] add tidy check on dist src files order Signed-off-by: onur-ozkan --- src/bootstrap/src/core/build_steps/dist.rs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs index afa409aa83506..a2c792ea2da4e 100644 --- a/src/bootstrap/src/core/build_steps/dist.rs +++ b/src/bootstrap/src/core/build_steps/dist.rs @@ -994,20 +994,22 @@ impl Step for PlainSourceTarball { // This is the set of root paths which will become part of the source package let src_files = [ + // tidy-alphabetical-start + ".gitmodules", + "Cargo.lock", + "Cargo.toml", + "config.example.toml", + "configure", + "CONTRIBUTING.md", "COPYRIGHT", "LICENSE-APACHE", + "license-metadata.json", "LICENSE-MIT", - "CONTRIBUTING.md", "README.md", "RELEASES.md", "REUSE.toml", - "license-metadata.json", - "configure", "x.py", - "config.example.toml", - "Cargo.toml", - "Cargo.lock", - ".gitmodules", + // tidy-alphabetical-end ]; let src_dirs = ["src", "compiler", "library", "tests", "LICENSES"]; From fdf4924a263a85165f3df8531da15e22e3fee823 Mon Sep 17 00:00:00 2001 From: onur-ozkan Date: Fri, 17 Jan 2025 09:42:38 +0300 Subject: [PATCH 2/2] include `x` and `x.ps1` scripts in tarball sources Helps to provide 1:1 build experience between git-managed and tarball sources. Signed-off-by: onur-ozkan --- src/bootstrap/src/core/build_steps/dist.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs index a2c792ea2da4e..470e400243f92 100644 --- a/src/bootstrap/src/core/build_steps/dist.rs +++ b/src/bootstrap/src/core/build_steps/dist.rs @@ -1008,6 +1008,8 @@ impl Step for PlainSourceTarball { "README.md", "RELEASES.md", "REUSE.toml", + "x", + "x.ps1", "x.py", // tidy-alphabetical-end ];