mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-25 08:13:41 +00:00
tidy: skip submodules if not present for non-CI environments
Signed-off-by: onur-ozkan <work@onurozkan.dev>
This commit is contained in:
parent
dd50e18ff0
commit
e9e3c38d01
@ -5697,6 +5697,7 @@ dependencies = [
|
||||
name = "tidy"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"build_helper",
|
||||
"cargo_metadata 0.15.4",
|
||||
"ignore",
|
||||
"miropt-test-tools",
|
||||
|
@ -1014,7 +1014,7 @@ impl Step for PlainSourceTarball {
|
||||
// perhaps it should be removed in favor of making `dist` perform the `vendor` step?
|
||||
|
||||
// Ensure we have all submodules from src and other directories checked out.
|
||||
for submodule in builder.get_all_submodules() {
|
||||
for submodule in build_helper::util::parse_gitmodules(&builder.src) {
|
||||
builder.update_submodule(Path::new(submodule));
|
||||
}
|
||||
|
||||
|
@ -4,13 +4,11 @@ use std::collections::BTreeSet;
|
||||
use std::env;
|
||||
use std::ffi::{OsStr, OsString};
|
||||
use std::fmt::{Debug, Write};
|
||||
use std::fs::{self, File};
|
||||
use std::fs;
|
||||
use std::hash::Hash;
|
||||
use std::io::{BufRead, BufReader};
|
||||
use std::ops::Deref;
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::process::Command;
|
||||
use std::sync::OnceLock;
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
use crate::core::build_steps::tool::{self, SourceType};
|
||||
@ -577,7 +575,7 @@ impl<'a> ShouldRun<'a> {
|
||||
///
|
||||
/// [`path`]: ShouldRun::path
|
||||
pub fn paths(mut self, paths: &[&str]) -> Self {
|
||||
let submodules_paths = self.builder.get_all_submodules();
|
||||
let submodules_paths = build_helper::util::parse_gitmodules(&self.builder.src);
|
||||
|
||||
self.paths.insert(PathSet::Set(
|
||||
paths
|
||||
@ -2238,28 +2236,6 @@ impl<'a> Builder<'a> {
|
||||
out
|
||||
}
|
||||
|
||||
/// Return paths of all submodules.
|
||||
pub fn get_all_submodules(&self) -> &[String] {
|
||||
static SUBMODULES_PATHS: OnceLock<Vec<String>> = OnceLock::new();
|
||||
|
||||
let init_submodules_paths = |src: &PathBuf| {
|
||||
let file = File::open(src.join(".gitmodules")).unwrap();
|
||||
|
||||
let mut submodules_paths = vec![];
|
||||
for line in BufReader::new(file).lines().map_while(Result::ok) {
|
||||
let line = line.trim();
|
||||
if line.starts_with("path") {
|
||||
let actual_path = line.split(' ').last().expect("Couldn't get value of path");
|
||||
submodules_paths.push(actual_path.to_owned());
|
||||
}
|
||||
}
|
||||
|
||||
submodules_paths
|
||||
};
|
||||
|
||||
SUBMODULES_PATHS.get_or_init(|| init_submodules_paths(&self.src))
|
||||
}
|
||||
|
||||
/// Ensure that a given step is built *only if it's supposed to be built by default*, returning
|
||||
/// its output. This will cache the step, so it's safe (and good!) to call this as often as
|
||||
/// needed to ensure that all dependencies are build.
|
||||
|
@ -1,4 +1,8 @@
|
||||
use std::fs::File;
|
||||
use std::io::{BufRead, BufReader};
|
||||
use std::path::Path;
|
||||
use std::process::Command;
|
||||
use std::sync::OnceLock;
|
||||
|
||||
/// Invokes `build_helper::util::detail_exit` with `cfg!(test)`
|
||||
///
|
||||
@ -45,3 +49,27 @@ pub fn try_run(cmd: &mut Command, print_cmd_on_fail: bool) -> Result<(), ()> {
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
/// Returns the submodule paths from the `.gitmodules` file in the given directory.
|
||||
pub fn parse_gitmodules(target_dir: &Path) -> &[String] {
|
||||
static SUBMODULES_PATHS: OnceLock<Vec<String>> = OnceLock::new();
|
||||
let gitmodules = target_dir.join(".gitmodules");
|
||||
assert!(gitmodules.exists(), "'{}' file is missing.", gitmodules.display());
|
||||
|
||||
let init_submodules_paths = || {
|
||||
let file = File::open(gitmodules).unwrap();
|
||||
|
||||
let mut submodules_paths = vec![];
|
||||
for line in BufReader::new(file).lines().map_while(Result::ok) {
|
||||
let line = line.trim();
|
||||
if line.starts_with("path") {
|
||||
let actual_path = line.split(' ').last().expect("Couldn't get value of path");
|
||||
submodules_paths.push(actual_path.to_owned());
|
||||
}
|
||||
}
|
||||
|
||||
submodules_paths
|
||||
};
|
||||
|
||||
SUBMODULES_PATHS.get_or_init(|| init_submodules_paths())
|
||||
}
|
||||
|
@ -5,6 +5,7 @@ edition = "2021"
|
||||
autobins = false
|
||||
|
||||
[dependencies]
|
||||
build_helper = { path = "../build_helper" }
|
||||
cargo_metadata = "0.15"
|
||||
regex = "1"
|
||||
miropt-test-tools = { path = "../miropt-test-tools" }
|
||||
|
@ -1,7 +1,9 @@
|
||||
//! Checks the licenses of third-party dependencies.
|
||||
|
||||
use build_helper::ci::CiEnv;
|
||||
use cargo_metadata::{Metadata, Package, PackageId};
|
||||
use std::collections::HashSet;
|
||||
use std::fs::read_dir;
|
||||
use std::path::Path;
|
||||
|
||||
/// These are licenses that are allowed for all crates, including the runtime,
|
||||
@ -514,7 +516,19 @@ const PERMITTED_CRANELIFT_DEPENDENCIES: &[&str] = &[
|
||||
pub fn check(root: &Path, cargo: &Path, bad: &mut bool) {
|
||||
let mut checked_runtime_licenses = false;
|
||||
|
||||
let submodules = build_helper::util::parse_gitmodules(root);
|
||||
for &(workspace, exceptions, permitted_deps) in WORKSPACES {
|
||||
// Skip if it's a submodule, not in a CI environment, and not initialized.
|
||||
//
|
||||
// This prevents enforcing developers to fetch submodules for tidy.
|
||||
if submodules.contains(&workspace.into())
|
||||
&& !CiEnv::is_ci()
|
||||
// If the directory is empty, we can consider it as an uninitialized submodule.
|
||||
&& read_dir(root.join(workspace)).unwrap().next().is_none()
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if !root.join(workspace).join("Cargo.lock").exists() {
|
||||
tidy_error!(bad, "the `{workspace}` workspace doesn't have a Cargo.lock");
|
||||
continue;
|
||||
|
@ -1,6 +1,7 @@
|
||||
//! Check for external package sources. Allow only vendorable packages.
|
||||
|
||||
use std::fs;
|
||||
use build_helper::ci::CiEnv;
|
||||
use std::fs::{self, read_dir};
|
||||
use std::path::Path;
|
||||
|
||||
/// List of allowed sources for packages.
|
||||
@ -13,7 +14,19 @@ const ALLOWED_SOURCES: &[&str] = &[
|
||||
/// Checks for external package sources. `root` is the path to the directory that contains the
|
||||
/// workspace `Cargo.toml`.
|
||||
pub fn check(root: &Path, bad: &mut bool) {
|
||||
let submodules = build_helper::util::parse_gitmodules(root);
|
||||
for &(workspace, _, _) in crate::deps::WORKSPACES {
|
||||
// Skip if it's a submodule, not in a CI environment, and not initialized.
|
||||
//
|
||||
// This prevents enforcing developers to fetch submodules for tidy.
|
||||
if submodules.contains(&workspace.into())
|
||||
&& !CiEnv::is_ci()
|
||||
// If the directory is empty, we can consider it as an uninitialized submodule.
|
||||
&& read_dir(root.join(workspace)).unwrap().next().is_none()
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
// FIXME check other workspaces too
|
||||
// `Cargo.lock` of rust.
|
||||
let path = root.join(workspace).join("Cargo.lock");
|
||||
|
Loading…
Reference in New Issue
Block a user