From 8693eeab0b8a79731ecee89cb6dfd240eef49736 Mon Sep 17 00:00:00 2001
From: Adrian Clay Lake <clay.lake@canonical.com>
Date: Wed, 23 Apr 2025 14:03:19 +0200
Subject: [PATCH 1/2] fix: chance ci paths to use local repo

---
 .github/workflows/ci-pr-target.yaml | 2 +-
 .github/workflows/ci.yaml           | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci-pr-target.yaml b/.github/workflows/ci-pr-target.yaml
index cf78021..345aef3 100644
--- a/.github/workflows/ci-pr-target.yaml
+++ b/.github/workflows/ci-pr-target.yaml
@@ -11,4 +11,4 @@ on:
 jobs:
   pkg-deps:
     name: Package dependencies
-    uses: canonical/chisel-releases/.github/workflows/pkg-deps.yaml@main
+    uses: clay-lake/chisel-releases/.github/workflows/pkg-deps.yaml@main
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 06f0960..15761a5 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -10,16 +10,16 @@ jobs:
   cla-check:
     if: github.event_name == 'pull_request'
     name: CLA check
-    uses: canonical/chisel-releases/.github/workflows/cla-check.yaml@main
+    uses: clay-lake/chisel-releases/.github/workflows/cla-check.yaml@main
 
   installability-tests:
     name: Installability tests
-    uses: canonical/chisel-releases/.github/workflows/install-slices.yaml@main
+    uses: clay-lake/chisel-releases/.github/workflows/install-slices.yaml@main
 
   lint:
     name: Lint
-    uses: canonical/chisel-releases/.github/workflows/lint.yaml@main
+    uses: clay-lake/chisel-releases/.github/workflows/lint.yaml@main
 
   integration-tests:
     name: Integration tests
-    uses: canonical/chisel-releases/.github/workflows/spread.yaml@main
+    uses: clay-lake/chisel-releases/.github/workflows/spread.yaml@main

From e19fa5a938bcbc958a43fc110bfa5e2f0e1b9a9b Mon Sep 17 00:00:00 2001
From: Adrian Clay Lake <clay.lake@canonical.com>
Date: Wed, 23 Apr 2025 14:07:55 +0200
Subject: [PATCH 2/2] feat(24.04): add brotli

---
 slices/brotli.yaml                        | 16 ++++++++++++++++
 slices/libbrotli1.yaml                    |  1 -
 tests/spread/integration/brotli/task.yaml | 15 +++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 slices/brotli.yaml
 create mode 100644 tests/spread/integration/brotli/task.yaml

diff --git a/slices/brotli.yaml b/slices/brotli.yaml
new file mode 100644
index 0000000..7d500ea
--- /dev/null
+++ b/slices/brotli.yaml
@@ -0,0 +1,16 @@
+package: brotli
+
+essential:
+  - brotli_copyright
+
+slices:
+  bins:
+    essential:
+      - libbrotli1_libs
+      - libc6_libs
+    contents:
+      /usr/bin/brotli:
+
+  copyright:
+    contents:
+      /usr/share/doc/brotli/copyright:
diff --git a/slices/libbrotli1.yaml b/slices/libbrotli1.yaml
index 9d29008..d8b1716 100644
--- a/slices/libbrotli1.yaml
+++ b/slices/libbrotli1.yaml
@@ -11,7 +11,6 @@ slices:
       /usr/lib/*-linux-*/libbrotlicommon.so.1*:
       /usr/lib/*-linux-*/libbrotlidec.so.1*:
       /usr/lib/*-linux-*/libbrotlienc.so.1*:
-
   copyright:
     contents:
       /usr/share/doc/libbrotli1/copyright:
diff --git a/tests/spread/integration/brotli/task.yaml b/tests/spread/integration/brotli/task.yaml
new file mode 100644
index 0000000..34ab638
--- /dev/null
+++ b/tests/spread/integration/brotli/task.yaml
@@ -0,0 +1,15 @@
+summary: Integration tests for brotli
+
+execute: |
+
+  # testing for only bins slice
+  rootfs_bins="$(install-slices brotli_bins)"
+
+  # generate a test file
+  echo "Hello World!" > "${rootfs_bins}/input.txt"
+
+  # test compression and decompression commands
+  chroot "${rootfs_bins}" /usr/bin/brotli -k input.txt
+  cmp "${rootfs_bins}/input.txt" <(chroot "${rootfs_bins}" brotli -d -c input.txt.br)
+
+