fix snapshot and ghcr_pkg handling

Author: QaidVoid

sbuild-linter/src/build_config/mod.rs

@@ -46,6 +46,7 @@ pub struct BuildConfig {
     pub src_url: Vec<String>,
     pub tag: Option<Vec<String>>,
     pub ghcr_pkg: Option<String>,
+    pub snapshots: Option<Vec<String>>,
     pub x_exec: XExec,
 }
 
@@ -230,6 +231,9 @@ impl BuildConfig {
         if let Some(val) = values.get("ghcr_pkg") {
             config.ghcr_pkg = val.as_str().map(String::from);
         }
+        if let Some(val) = values.get("snapshots") {
+            config.snapshots = to_string_vec(val);
+        }
         config.x_exec = XExec::deserialize(values.get("x_exec").unwrap()).unwrap();
 
         config
@@ -407,6 +411,14 @@ impl BuildConfig {
             }
         }
 
+        write_field_comments(writer, "snapshots")?;
+        if let Some(ref snapshots) = self.snapshots {
+            writeln!(writer, "{}snapshots:", indent_str)?;
+            for s in snapshots {
+                writeln!(writer, "{}  - \"{}\"", indent_str, s)?;
+            }
+        }
+
         write_field_comments(writer, "x_exec")?;
         writeln!(writer, "{}x_exec:", indent_str)?;
         self.x_exec.write_yaml(writer, indent + 2)?;

sbuild-linter/src/validator.rs

@@ -1419,6 +1419,7 @@ pub const FIELD_VALIDATORS: &[FieldValidator] = &[
     FieldValidator::new("src_url", FieldType::StringArray, true),
     FieldValidator::new("tag", FieldType::StringArray, false),
     FieldValidator::new("ghcr_pkg", FieldType::String, false),
+    FieldValidator::new("snapshots", FieldType::StringArray, false),
     FieldValidator::new("x_exec", FieldType::XExec, true),
 ];
 

sbuild/src/main.rs

@@ -661,8 +661,10 @@ async fn post_build_processing(
                     // Sanitize package name for OCI compatibility (e.g., c++filt -> c-filt)
                     let sanitized_pkg_name = sanitize_oci_name(pkg_name_dir);
                     // Use ghcr_pkg if specified, otherwise use auto-generated path
+                    // Extract owner from base_repo (first path component)
+                    let owner = base_repo.split('/').next().unwrap_or(base_repo);
                     let full_repo = if let Some(ref custom_base) = metadata.ghcr_pkg {
-                        format!("{}/{}", custom_base, sanitized_pkg_name)
+                        format!("{}/{}/{}", owner, custom_base, sanitized_pkg_name)
                     } else {
                         format!("{}/{}/{}/{}", base_repo, pkg_family, recipe_name, sanitized_pkg_name)
                     };
@@ -785,8 +787,10 @@ async fn post_build_processing(
                 for binary_name in &binaries_to_push {
                     // Sanitize binary name for OCI compatibility
                     let sanitized_binary_name = sanitize_oci_name(binary_name);
+                    // Extract owner from base_repo (first path component)
+                    let owner = base_repo.split('/').next().unwrap_or(base_repo);
                     let full_repo = if let Some(ref custom_base) = metadata.ghcr_pkg {
-                        format!("{}/{}", custom_base, sanitized_binary_name)
+                        format!("{}/{}/{}", owner, custom_base, sanitized_binary_name)
                     } else {
                         format!("{}/{}/{}/{}", base_repo, pkg_family, recipe_name, sanitized_binary_name)
                     };