From 6f8cf914476537bf8575f07181f9a07a96f6b07d Mon Sep 17 00:00:00 2001
From: Robert Sturla <robertsturla@outlook.com>
Date: Thu, 28 Mar 2024 16:35:17 +0000
Subject: [PATCH 1/5] Switch to new ISO builder action

---
 .github/workflows/build_iso.yml | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml
index f9ae92e..56e1ed5 100644
--- a/.github/workflows/build_iso.yml
+++ b/.github/workflows/build_iso.yml
@@ -35,24 +35,27 @@ jobs:
             
     steps:
       - name: Build ISOs
-        uses: ublue-os/isogenerator@1.0.9
+        uses: jasonn3/build-container-installer@v1.1.1
         id: build
         with:
-          ARCH: ${{ contains(matrix.image_tag, 'amd64') && 'x86_64' || 'arm64' }}
-          IMAGE_NAME: ${{ matrix.image_name }}
-          IMAGE_REPO: ghcr.io/ublue-os
+          arch: ${{ contains(matrix.image_tag, 'amd64') && 'x86_64' || 'arm64' }}
+          image_name: ${{ matrix.image_name }}
+          image_repo: ghcr.io/ublue-os
           # We cannot use Silverblue variant since we need the user creation options in anaconda
-          VARIANT: 'Kinoite'
-          VERSION: ${{ env.INSTALLER_VERSION }}
-          IMAGE_TAG: ${{ matrix.image_tag }}
-          SECURE_BOOT_KEY_URL: 'https://github.com/ublue-os/akmods/raw/main/certs/public_key.der'
-          ENROLLMENT_PASSWORD: 'ublue-os'
+          variant: 'Kinoite'
+          version: ${{ env.INSTALLER_VERSION }}
+          image_tag: ${{ matrix.image_tag }}
+          secure_boot_key_url: 'https://github.com/ublue-os/akmods/raw/main/certs/public_key.der'
+          enrollment_password: 'ublue-os'
+          iso_name: ${{ matrix.image_name }}-${{ steps.generate-tag.outputs.tag }}
 
       - name: Upload ISOs and Checksum to Job Artifacts
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.image_name }}-${{ matrix.image_tag }}
-          path: ${{ steps.build.outputs.output-directory }}
+          path: |
+            ${{ steps.build.outputs.iso_path }}
+            ${{ steps.build.outputs.iso_path }}-CHECKSUM
           if-no-files-found: error
           retention-days: 0
           compression-level: 0

From e87ab7976de11daf40e41477e074c33e307aeafd Mon Sep 17 00:00:00 2001
From: Robert Sturla <robertsturla@outlook.com>
Date: Thu, 28 Mar 2024 16:43:52 +0000
Subject: [PATCH 2/5] Disable Flatpak dependencies

---
 .github/workflows/build_iso.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml
index 56e1ed5..6f3c688 100644
--- a/.github/workflows/build_iso.yml
+++ b/.github/workflows/build_iso.yml
@@ -41,6 +41,7 @@ jobs:
           arch: ${{ contains(matrix.image_tag, 'amd64') && 'x86_64' || 'arm64' }}
           image_name: ${{ matrix.image_name }}
           image_repo: ghcr.io/ublue-os
+          enable_flatpak_dependencies: false
           # We cannot use Silverblue variant since we need the user creation options in anaconda
           variant: 'Kinoite'
           version: ${{ env.INSTALLER_VERSION }}

From 2b059907559c143598bb3714df9dde7131960080 Mon Sep 17 00:00:00 2001
From: Robert Sturla <robertsturla@outlook.com>
Date: Thu, 28 Mar 2024 16:45:44 +0000
Subject: [PATCH 3/5] Run on Ubuntuuu!

---
 .github/workflows/build_iso.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml
index 6f3c688..2adbda3 100644
--- a/.github/workflows/build_iso.yml
+++ b/.github/workflows/build_iso.yml
@@ -22,11 +22,6 @@ jobs:
       contents: read
       packages: write
       id-token: write
-    container:
-      image: fedora:40
-      options: "--privileged"
-      volumes:
-        - "/:/host"
     strategy:
       fail-fast: false
       matrix:

From 31d1b99f07cacd3f966e8550fe9c3a2e80fcf186 Mon Sep 17 00:00:00 2001
From: Noel Miller <4983138+noelmiller@users.noreply.github.com>
Date: Thu, 28 Mar 2024 20:54:08 -0500
Subject: [PATCH 4/5] chore(ci): try building with main branch

---
 .github/workflows/build_iso.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml
index 2adbda3..990e2b5 100644
--- a/.github/workflows/build_iso.yml
+++ b/.github/workflows/build_iso.yml
@@ -30,7 +30,7 @@ jobs:
             
     steps:
       - name: Build ISOs
-        uses: jasonn3/build-container-installer@v1.1.1
+        uses: jasonn3/build-container-installer@main
         id: build
         with:
           arch: ${{ contains(matrix.image_tag, 'amd64') && 'x86_64' || 'arm64' }}

From 5ddabc62f47035cb158252601bf8730d4cc9a548 Mon Sep 17 00:00:00 2001
From: Robert Sturla <robertsturla@outlook.com>
Date: Fri, 29 Mar 2024 13:30:25 +0000
Subject: [PATCH 5/5] Update .github/workflows/build_iso.yml

---
 .github/workflows/build_iso.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml
index 990e2b5..56e1ed6 100644
--- a/.github/workflows/build_iso.yml
+++ b/.github/workflows/build_iso.yml
@@ -30,7 +30,7 @@ jobs:
             
     steps:
       - name: Build ISOs
-        uses: jasonn3/build-container-installer@main
+        uses: jasonn3/build-container-installer@v1.1.2
         id: build
         with:
           arch: ${{ contains(matrix.image_tag, 'amd64') && 'x86_64' || 'arm64' }}