From 97f6a3231bffd94f13ed3203f9cacee8bd481dcd Mon Sep 17 00:00:00 2001
From: Robert Sturla <robertsturla@outlook.com>
Date: Thu, 19 Sep 2024 10:11:50 +0100
Subject: [PATCH] feat: rechunk images into smaller parts

---
 .github/workflows/build-39-aurora.yml | 40 ++++++++++----------
 .github/workflows/build-40-aurora.yml | 54 +++++++++++++--------------
 .github/workflows/reusable-build.yml  | 24 +++++++++---
 3 files changed, 66 insertions(+), 52 deletions(-)

diff --git a/.github/workflows/build-39-aurora.yml b/.github/workflows/build-39-aurora.yml
index 9f66952002a..dcb59b983f6 100644
--- a/.github/workflows/build-39-aurora.yml
+++ b/.github/workflows/build-39-aurora.yml
@@ -1,21 +1,21 @@
-name: Aurora 39
-on:
-  pull_request:
-    branches:
-      - main
-      - testing
-    paths-ignore:
-      - '**.md'
-      - 'system_files/silverblue/**'
-  schedule:
-    - cron: '41 5 * * 0'  # 5:41 UTC Weekly on Sunday
-  workflow_dispatch:
+# name: Aurora 39
+# on:
+#   pull_request:
+#     branches:
+#       - main
+#       - testing
+#     paths-ignore:
+#       - '**.md'
+#       - 'system_files/silverblue/**'
+#   schedule:
+#     - cron: '41 5 * * 0'  # 5:41 UTC Weekly on Sunday
+#   workflow_dispatch:
 
-jobs:
-  build:
-    name: build
-    uses: ./.github/workflows/reusable-build.yml
-    secrets: inherit
-    with:
-      brand_name: aurora
-      fedora_version: 39
+# jobs:
+#   build:
+#     name: build
+#     uses: ./.github/workflows/reusable-build.yml
+#     secrets: inherit
+#     with:
+#       brand_name: aurora
+#       fedora_version: 39
diff --git a/.github/workflows/build-40-aurora.yml b/.github/workflows/build-40-aurora.yml
index 4db70f405c9..316d47b23c8 100644
--- a/.github/workflows/build-40-aurora.yml
+++ b/.github/workflows/build-40-aurora.yml
@@ -1,28 +1,28 @@
-name: Aurora 40
-on:
-  merge_group:
-  pull_request:
-    branches:
-      - main
-      - testing
-    paths-ignore:
-      - '**.md'
-      - 'system_files/silverblue/**'
-  push:
-    branches:
-      - main
-    paths-ignore:
-      - '**.md'
-      - 'system_files/silverblue/**'
-  schedule:
-    - cron: '40 4 * * *'  # 4:40 UTC everyday
-  workflow_dispatch:
+# name: Aurora 40
+# on:
+#   merge_group:
+#   pull_request:
+#     branches:
+#       - main
+#       - testing
+#     paths-ignore:
+#       - '**.md'
+#       - 'system_files/silverblue/**'
+#   push:
+#     branches:
+#       - main
+#     paths-ignore:
+#       - '**.md'
+#       - 'system_files/silverblue/**'
+#   schedule:
+#     - cron: '40 4 * * *'  # 4:40 UTC everyday
+#   workflow_dispatch:
 
-jobs:
-  build:
-    name: build
-    uses: ./.github/workflows/reusable-build.yml
-    secrets: inherit
-    with:
-      brand_name: aurora
-      fedora_version: 40
+# jobs:
+#   build:
+#     name: build
+#     uses: ./.github/workflows/reusable-build.yml
+#     secrets: inherit
+#     with:
+#       brand_name: aurora
+#       fedora_version: 40
diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
index f36770a834b..498498127e3 100644
--- a/.github/workflows/reusable-build.yml
+++ b/.github/workflows/reusable-build.yml
@@ -34,13 +34,13 @@ jobs:
         image_flavor:
           - main
           - nvidia
-          - asus
-          - asus-nvidia
-          - surface
-          - surface-nvidia
+          # - asus
+          # - asus-nvidia
+          # - surface
+          # - surface-nvidia
         base_name:
           - ${{ inputs.brand_name }}
-          - ${{ inputs.brand_name }}-dx
+          # - ${{ inputs.brand_name }}-dx
         fedora_version:
           - ${{ inputs.fedora_version }}
         exclude:
@@ -293,6 +293,20 @@ jobs:
           kernel_suffix: ${{ env.KERNEL_SUFFIX }}
           strip: false
 
+      - name: Check Pre Rechunk
+        run:
+          podman image ls
+
+      - name: Rechunk Image
+        uses: hhd-dev/rechunk@main
+        with:
+          ref: ${{ steps.build_image.outputs.image }}@{{ steps.generate-tags.outputs.DEFAULT_TAG }}
+          skip_compression: 'true'
+
+      - name: Check Post Rechunk
+        run:
+          podman image ls
+
       # Workaround bug where capital letters in your GitHub username make it impossible to push to GHCR.
       # https://github.com/macbre/push-to-ghcr/issues/12
       - name: Lowercase Registry