Merge pull request #28 from FyraLabs/w/size-compression

feat(ci): improve compression speed
FyraLabs · Sep 28, 2024 · 5ccdd8e · 5ccdd8e
2 parents 28f245e + a0bf0e6
commit 5ccdd8e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 22 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -76,18 +76,19 @@ jobs:
       - name: Run test
         run: |
           export PATH=$HOME/.cargo/bin:$PATH
+          export KATSU_KEEP_CHROOT=1
           pushd tests/ng
           echo "COLORBT_SHOW_HIDDEN=1" >> .env
           echo "KATSU_LOG=trace" >> .env
           katsu -o disk-image katsu-arm.yaml 2>&1
-          xz -z9 katsu-work/image/katsu.img -c > katsu-work/image/katsu-arm.img.xz
+          zstd -19 katsu-work/image/katsu.img -c > katsu-work/image/katsu-arm.raw.zstd
           popd
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
           name: image-arm
-          path: tests/ng/katsu-work/image/*.img.xz
+          path: tests/ng/katsu-work/image/*.raw.zstd
 
   image-x86_64:
     runs-on: ubuntu-latest
@@ -120,24 +121,24 @@ jobs:
       - uses: Swatinem/rust-cache@v2
 
       - name: Build and install katsu
-        run: |
-          cargo install --path . --debug
+        run: cargo install --path . --debug
 
       - name: Run test
         run: |
           export PATH=$HOME/.cargo/bin:$PATH
+          export KATSU_KEEP_CHROOT=1
           pushd tests/ng
           echo "COLORBT_SHOW_HIDDEN=1" >> .env
           echo "KATSU_LOG=trace" >> .env
           katsu -o disk-image katsu.yaml 2>&1
-          xz -z9 katsu-work/image/katsu.img -c > katsu-work/image/katsu.raw.xz
+          zstd -19 katsu-work/image/katsu.img -c > katsu-work/image/katsu.raw.zstd
           popd
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
           name: image-x86_64
-          path: tests/ng/katsu-work/image/*.raw.xz
+          path: tests/ng/katsu-work/image/*.raw.zstd
 
   iso-x86_64:
     runs-on: ubuntu-latest
@@ -161,33 +162,32 @@ jobs:
             dnf-
 
       - name: Install dependencies
-        run: |
-          dnf install -y $DNF_PKGS
+        run: dnf install -y $DNF_PKGS
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
       - uses: Swatinem/rust-cache@v2
 
       - name: Build and install katsu
-        run: |
-          cargo install --path . --debug
+        run: cargo install --path . --debug
 
       - name: Run test
         run: |
           export PATH=$HOME/.cargo/bin:$PATH
+          export KATSU_KEEP_CHROOT=1
           pushd tests/ng
           echo "COLORBT_SHOW_HIDDEN=1" >> .env
           echo "KATSU_LOG=trace" >> .env
           katsu -o iso katsu-iso.yaml 2>&1
-          xz -z9 out.iso -c > katsu-work/image/katsu.iso.xz
+          mv out.iso katsu-work/image/katsu.iso
           popd
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
           name: iso-x86_64
-          path: tests/ng/katsu-work/image/*.iso.xz
+          path: tests/ng/katsu-work/image/katsu.iso
 
   iso-limine-x86_64:
     runs-on: ubuntu-latest
@@ -211,33 +211,32 @@ jobs:
             dnf-
 
       - name: Install dependencies
-        run: |
-          dnf install -y $DNF_PKGS
+        run: dnf install -y $DNF_PKGS
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
       - uses: Swatinem/rust-cache@v2
 
       - name: Build and install katsu
-        run: |
-          cargo install --path . --debug
+        run: cargo install --path . --debug
 
       - name: Run test
         run: |
           export PATH=$HOME/.cargo/bin:$PATH
+          export KATSU_KEEP_CHROOT=1
           pushd tests/ng
           echo "COLORBT_SHOW_HIDDEN=1" >> .env
           echo "KATSU_LOG=trace" >> .env
           katsu -o iso katsu-iso-limine.yaml 2>&1
-          xz -z9 out.iso -c > katsu-work/image/katsu.iso.xz
+          mv out.iso katsu-work/image/katsu.iso
           popd
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
           name: iso-limine-x86_64
-          path: tests/ng/katsu-work/image/*.iso.xz
+          path: tests/ng/katsu-work/image/katsu.iso
 
   fs-test-x86_64:
     runs-on: ubuntu-latest
@@ -261,21 +260,20 @@ jobs:
             dnf-
 
       - name: Install dependencies
-        run: |
-          dnf install -y $DNF_PKGS
+        run: dnf install -y $DNF_PKGS
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
       - uses: Swatinem/rust-cache@v2
 
       - name: Build and install katsu
-        run: |
-          cargo install --path . --debug
+        run: cargo install --path . --debug
 
       - name: Run test
         run: |
           export PATH=$HOME/.cargo/bin:$PATH
+          export KATSU_KEEP_CHROOT=1
           pushd tests/ng
           echo "COLORBT_SHOW_HIDDEN=1" >> .env
           echo "KATSU_LOG=trace" >> .env

diff --git a/src/builder.rs b/src/builder.rs
@@ -460,6 +460,7 @@ pub trait ImageBuilder {
 	) -> Result<()>;
 }
 /// Creates a disk image, then installs to it
+#[allow(dead_code)]
 pub struct DiskImageBuilder {
 	pub image: PathBuf,
 	pub bootloader: Bootloader,
@@ -500,6 +501,7 @@ impl ImageBuilder for DiskImageBuilder {
 }
 
 /// Installs directly to a device
+#[allow(dead_code)]
 pub struct DeviceInstaller {
 	pub device: PathBuf,
 	pub bootloader: Bootloader,
@@ -518,6 +520,7 @@ impl ImageBuilder for DeviceInstaller {
 }
 
 /// Installs as a raw chroot
+#[allow(dead_code)]
 pub struct FsBuilder {
 	pub bootloader: Bootloader,
 	pub root_builder: Box<dyn RootBuilder>,