diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ffac21692..e2ef502ec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,7 @@ stages: - test fmt: + image: "rust:trixie" stage: lint rules: - if: '$CI_COMMIT_BRANCH == "master" && $CI_PROJECT_NAMESPACE == "redox-os"' @@ -17,6 +18,7 @@ fmt: - cargo fmt -- --check cargo-test: + image: "rust:trixie" stage: lint rules: - if: '$CI_COMMIT_BRANCH == "master" && $CI_PROJECT_NAMESPACE == "redox-os"' diff --git a/src/cook/cook_build.rs b/src/cook/cook_build.rs index 74513d035..74d515c9b 100644 --- a/src/cook/cook_build.rs +++ b/src/cook/cook_build.rs @@ -21,7 +21,7 @@ use std::{ use crate::{is_redox, log_to_pty}; fn auto_deps_from_dynamic_linking( - stage_dirs: &Vec, + stage_dirs: &[PathBuf], target_dir: &Path, dep_pkgars: &BTreeSet<(PackageName, PathBuf)>, logger: &PtyOut, @@ -601,7 +601,7 @@ mod tests { ); let entries = super::auto_deps_from_dynamic_linking( - &root, + &vec![root.clone()], &root.join(".."), &Default::default(), &None, diff --git a/src/recipe.rs b/src/recipe.rs index 5e0b4ce6e..953c2f6c3 100644 --- a/src/recipe.rs +++ b/src/recipe.rs @@ -15,7 +15,7 @@ use serde::{ use crate::{WALK_DEPTH, cook::package as cook_package}; /// Specifies how to download the source for a recipe -#[derive(Debug, Clone, Deserialize, PartialEq, Serialize)] +#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] #[serde(untagged)] pub enum SourceRecipe { /// Reuse the source directory of another package @@ -450,7 +450,7 @@ mod tests { #[test] fn git_cargo_recipe() { - use crate::recipe::{BuildKind, BuildRecipe, PackageRecipe, Recipe, SourceRecipe}; + use crate::recipe::{BuildKind, BuildRecipe, Recipe, SourceRecipe}; let recipe: Recipe = toml::from_str( r#" @@ -470,9 +470,12 @@ mod tests { Recipe { source: Some(SourceRecipe::Git { git: "https://gitlab.redox-os.org/redox-os/acid.git".to_string(), + upstream: None, branch: Some("master".to_string()), rev: Some("06344744d3d55a5ac9a62a6059cb363d40699bbc".to_string()), - ..Default::default() + patches: Vec::new(), + script: None, + shallow_clone: None, }), build: BuildRecipe::new(BuildKind::Cargo { package_path: None, @@ -485,7 +488,7 @@ mod tests { #[test] fn tar_custom_recipe() { - use crate::recipe::{BuildKind, BuildRecipe, PackageRecipe, Recipe, SourceRecipe}; + use crate::recipe::{BuildKind, BuildRecipe, Recipe, SourceRecipe}; let recipe: Recipe = toml::from_str( r#" @@ -544,7 +547,7 @@ mod tests { build: BuildRecipe::new(BuildKind::None), package: PackageRecipe { dependencies: vec![PackageName::new("gcc13").unwrap()], - ....Default::default() + ..Default::default() }, ..Default::default() }