hack: test

Author: HuijingHei

.packit.yaml

@@ -15,33 +15,34 @@ srpm_build_deps:
   - git
   - libzstd-devel
   - openssl-devel
-  - systemd
   - zstd
 
+actions:
+  # The last setp here is required by Packit to return the archive name
+  # https://packit.dev/docs/configuration/actions#create-archive
+  create-archive:
+    - bash -c "cargo install cargo-vendor-filterer"
+    - bash -c "cargo xtask spec"
+    - bash -c "cat target/bootupd.spec"
+    - bash -c "cp target/bootupd* contrib/packaging/"
+    - bash -c "ls -1 target/bootupd*.tar.zstd | grep -v 'vendor'"
+  # Do nothing with spec file. Two steps here are for debugging
+  fix-spec-file:
+    - bash -c "cat contrib/packaging/bootupd.spec"
+    - bash -c "ls -al contrib/packaging/"
+
 jobs:
   - job: copr_build
     trigger: pull_request
     targets:
-      - centos-stream-9-x86_64
-      - centos-stream-9-aarch64
-      - centos-stream-9-s390x
-      - centos-stream-10-x86_64
-      - centos-stream-10-aarch64
-      - centos-stream-10-s390x
-      - centos-stream-10-ppc64le
-      - fedora-43-x86_64
-      - fedora-43-aarch64
-      - fedora-43-s390x
-      - fedora-43-ppc64le
-      - fedora-rawhide-x86_64
       - fedora-rawhide-aarch64
-      - fedora-rawhide-s390x
-      - fedora-rawhide-ppc64le
+      - fedora-rawhide-x86_64
 
   - job: tests
     trigger: pull_request
     targets:
       - fedora-rawhide-aarch64
+      - fedora-rawhide-x86_64
     tmt_plan: /tmt/plans/package
 
   - job: propose_downstream

contrib/packaging/bootupd.spec

@@ -9,7 +9,7 @@ Summary:        Bootloader updater
 
 License:        Apache-2.0
 URL:            https://github.com/coreos/bootupd
-Source0:        %{crates_source}
+Source0:        %{url}/releases/download/v%{version}/bootupd-%{version}.tar.zstd
 Source1:        %{url}/releases/download/v%{version}/bootupd-%{version}-vendor.tar.zstd
 %if 0%{?fedora} || 0%{?rhel} >= 10
 ExcludeArch:    %{ix86}

xtask/src/main.rs

@@ -32,6 +32,7 @@ fn try_main() -> Result<()> {
             "vendor" => vendor,
             "package" => package,
             "package-srpm" => package_srpm,
+            "spec" => spec,
             _ => print_help,
         };
         f(&sh)?;
@@ -155,10 +156,9 @@ fn impl_package(sh: &Shell) -> Result<Package> {
         )
         .run()?;
     }
-    // Compress with gzip and write to crate
-    let srcpath: Utf8PathBuf = Utf8Path::new("target").join(format!("{namev}.crate"));
-    cmd!(sh, "gzip --force --best {p}").run()?;
-    std::fs::rename(format!("{p}.gz"), &srcpath)?;
+    // Compress with zstd
+    let srcpath: Utf8PathBuf = format!("{p}.zstd").into();
+    cmd!(sh, "zstd --rm -f {p} -o {srcpath}").run()?;
 
     Ok(Package {
         version: v,
@@ -243,6 +243,42 @@ fn package_srpm(sh: &Shell) -> Result<()> {
     Ok(())
 }
 
+fn update_spec(sh: &Shell) -> Result<Utf8PathBuf> {
+    let _targetdir = get_target_dir()?;
+    let p = Utf8Path::new("target");
+    let pkg = impl_package(sh)?;
+    let srcpath = pkg.srcpath.file_name().unwrap();
+    let v = pkg.version;
+    let src_vendorpath = pkg.vendorpath.file_name().unwrap();
+    {
+        let specin = File::open(format!("contrib/packaging/{NAME}.spec"))
+            .map(BufReader::new)
+            .context("Opening spec")?;
+        let mut o = File::create(p.join(format!("{NAME}.spec"))).map(BufWriter::new)?;
+        for line in specin.lines() {
+            let line = line?;
+            if line.starts_with("Version:") {
+                writeln!(o, "# Replaced by cargo xtask spec")?;
+                writeln!(o, "Version: {v}")?;
+            } else if line.starts_with("Source0") {
+                writeln!(o, "Source0: {srcpath}")?;
+            } else if line.starts_with("Source1") {
+                writeln!(o, "Source1: {src_vendorpath}")?;
+            } else {
+                writeln!(o, "{line}")?;
+            }
+        }
+    }
+    let spec_path = p.join(format!("{NAME}.spec"));
+    Ok(spec_path)
+}
+
+fn spec(sh: &Shell) -> Result<()> {
+    let s = update_spec(sh)?;
+    println!("Generated: {s}");
+    Ok(())
+}
+
 fn print_help(_sh: &Shell) -> Result<()> {
     eprintln!(
         "Tasks: