From 362fea7d5d5df8d8d2412379c05b77bdaaf934a0 Mon Sep 17 00:00:00 2001
From: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
Date: Thu, 2 Jan 2025 09:02:24 -0500
Subject: [PATCH 01/12] Block broken lorax versions (#152)

---
 .github/workflows/build_iso.yml       | 6 +++---
 .github/workflows/test_deployment.yml | 6 +++---
 .github/workflows/test_iso.yml        | 6 +++---
 external/Makefile                     | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml
index 4c89f38..3c2316d 100644
--- a/.github/workflows/build_iso.yml
+++ b/.github/workflows/build_iso.yml
@@ -53,7 +53,7 @@ jobs:
         id: jobs
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          job_name: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }})"
+          job_name: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }}, ${{ matrix.image_name }})"
           per_page: 100
 
       - name: Set status
@@ -62,7 +62,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           status: pending
-          context: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }})"
+          context: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }}, ${{ matrix.image_name }})"
           sha: ${{ env.sha }}
           targetUrl: ${{ steps.jobs.outputs.html_url }}
 
@@ -138,7 +138,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           status: ${{ job.status }}
-          context: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }})"
+          context: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }}, ${{ matrix.image_name }})"
           sha: ${{ env.sha }}
           targetUrl: ${{ steps.jobs.outputs.html_url }}
 
diff --git a/.github/workflows/test_deployment.yml b/.github/workflows/test_deployment.yml
index 792b68a..ec85345 100644
--- a/.github/workflows/test_deployment.yml
+++ b/.github/workflows/test_deployment.yml
@@ -52,7 +52,7 @@ jobs:
         id: jobs
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          job_name: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }})"
+          job_name: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }}, ${{ matrix.image_name }})"
           per_page: 100
 
       - name: Set status
@@ -61,7 +61,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           status: pending
-          context: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }})"
+          context: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }}, ${{ matrix.image_name }})"
           sha: ${{ env.sha }}
           targetUrl: ${{ steps.jobs.outputs.html_url }}
 
@@ -107,6 +107,6 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           status: ${{ job.status }}
-          context: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }})"
+          context: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }}, ${{ matrix.image_name }})"
           sha: ${{ env.sha }}
           targetUrl: ${{ steps.jobs.outputs.html_url }}
diff --git a/.github/workflows/test_iso.yml b/.github/workflows/test_iso.yml
index 3b072d7..4697e30 100644
--- a/.github/workflows/test_iso.yml
+++ b/.github/workflows/test_iso.yml
@@ -52,7 +52,7 @@ jobs:
         id: jobs
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          job_name: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }})"
+          job_name: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }}, ${{ matrix.image_name }})"
           per_page: 100
 
       - name: Set status
@@ -61,7 +61,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           status: pending
-          context: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }})"
+          context: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }}, ${{ matrix.image_name }})"
           sha: ${{ env.sha }}
           targetUrl: ${{ steps.jobs.outputs.html_url }}
 
@@ -98,6 +98,6 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           status: ${{ job.status }}
-          context: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }})"
+          context: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }}, ${{ matrix.image_name }})"
           sha: ${{ env.sha }}
           targetUrl: ${{ steps.jobs.outputs.html_url }}
\ No newline at end of file
diff --git a/external/Makefile b/external/Makefile
index 74047b1..0cac3e7 100644
--- a/external/Makefile
+++ b/external/Makefile
@@ -1,6 +1,6 @@
 lorax/branch-$(VERSION):
 	git config advice.detachedHead false
-	cd lorax && git reset --hard HEAD && git checkout $(if $(_RHEL),rhel$(word 1,$(subst ., ,$(VERSION)))-branch,tags/$(shell cd lorax && git tag -l lorax-$(VERSION).* --sort=creatordate | tail -n 1))
+	cd lorax && git reset --hard HEAD && git checkout $(if $(_RHEL),rhel$(word 1,$(subst ., ,$(VERSION)))-branch,tags/$(shell cd lorax && git tag -l lorax-$(VERSION).* --sort=creatordate | grep -v 'lorax-40\.5' | tail -n 1))
 	touch lorax/branch-$(VERSION)
 
 install-deps:

From 46786df34449d211be50addcde81570b6e5aba8b Mon Sep 17 00:00:00 2001
From: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
Date: Wed, 8 Jan 2025 10:39:29 -0500
Subject: [PATCH 02/12] Test with base Fedora images (#155)

---
 .github/workflows/build_vars.yml | 36 ++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build_vars.yml b/.github/workflows/build_vars.yml
index ffbe614..336a401 100644
--- a/.github/workflows/build_vars.yml
+++ b/.github/workflows/build_vars.yml
@@ -9,7 +9,7 @@ on:
         value: '
           {
             "version": [
-              "39", 
+              "39",
               "40",
               "41"
             ],
@@ -19,10 +19,38 @@ on:
               "flatpak_refs"
             ],
             "image_repo": [
-              "ghcr.io/ublue-os"
+              "ghcr.io/ublue-os",
+              "quay.io/fedora-ostree-desktops"
             ],
-            "image_name": [
-              "base-main"
+            "include": [
+              {
+                "image_repo": "ghcr.io/ublue-os",
+                "image_name": "base-main",
+              },
+              {
+                "image_repo": "quay.io/fedora-ostree-desktops",
+                "version": "40",
+                "image_name": "base"
+              },
+              {
+                "image_repo": "quay.io/fedora-ostree-desktops",
+                "version": "41",
+                "image_name": "base-atomic"
+              }
+            ],
+            "exclude": [
+              {
+                "image_repo": "quay.io/fedora-ostree-desktops",
+                "version": "39"
+              },
+              {
+                "image_repo": "quay.io/fedora-ostree-desktops",
+                "flatpaks": "flatpak_refs_dir"
+              },
+              {
+                "image_repo": "quay.io/fedora-ostree-desktops",
+                "flatpaks": "flatpak_refs"
+              }
             ]
           }'
       VARIANT:

From d2186329e46f75e7b88a932554869ba173b923cf Mon Sep 17 00:00:00 2001
From: RoyalOughtness <129108030+RoyalOughtness@users.noreply.github.com>
Date: Mon, 3 Feb 2025 06:32:53 -0800
Subject: [PATCH 03/12] fix: typo (#156)

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 7115248..3615f05 100644
--- a/action.yml
+++ b/action.yml
@@ -89,7 +89,7 @@ inputs:
     description: Overrides the skopeo cache key
     required: false
   variant:
-    description: "Source container variant. Available options can be found by running `dnf provides system-release`. Variant will be the third item in the package name. Example: `fedora-release-kinoite-39-34.noarch` will be kinonite"
+    description: "Source container variant. Available options can be found by running `dnf provides system-release`. Variant will be the third item in the package name. Example: `fedora-release-kinoite-39-34.noarch` will be kinoite"
     required: true
     default: Server
   version:

From 45fec1fc9de463178cf414c8045a2480aa3d8419 Mon Sep 17 00:00:00 2001
From: Noel Miller <4983138+noelmiller@users.noreply.github.com>
Date: Mon, 5 May 2025 16:07:08 -0500
Subject: [PATCH 04/12] Add tests for 42 (#161)

Co-authored-by: Jason N. <33561705+JasonN3@users.noreply.github.com>
---
 .github/workflows/build_vars.yml | 23 +++++++++++++++--------
 Makefile                         | 32 ++++++++++++++++----------------
 lorax_templates/Makefile         |  8 ++++++--
 test/vm/Makefile                 |  4 ++--
 4 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/build_vars.yml b/.github/workflows/build_vars.yml
index 336a401..e74c6ca 100644
--- a/.github/workflows/build_vars.yml
+++ b/.github/workflows/build_vars.yml
@@ -9,9 +9,9 @@ on:
         value: '
           {
             "version": [
-              "39",
               "40",
-              "41"
+              "41",
+              "42"
             ],
             "flatpaks": [
               "false",
@@ -20,6 +20,7 @@ on:
             ],
             "image_repo": [
               "ghcr.io/ublue-os",
+              "quay.io/fedora",
               "quay.io/fedora-ostree-desktops"
             ],
             "include": [
@@ -28,20 +29,22 @@ on:
                 "image_name": "base-main",
               },
               {
-                "image_repo": "quay.io/fedora-ostree-desktops",
-                "version": "40",
-                "image_name": "base"
+                "image_repo": "quay.io/fedora",
+                "image_name": "fedora-bootc"
               },
               {
                 "image_repo": "quay.io/fedora-ostree-desktops",
-                "version": "41",
                 "image_name": "base-atomic"
               }
             ],
             "exclude": [
               {
-                "image_repo": "quay.io/fedora-ostree-desktops",
-                "version": "39"
+                "image_repo": "quay.io/fedora",
+                "flatpaks": "flatpak_refs_dir"
+              },
+              {
+                "image_repo": "quay.io/fedora",
+                "flatpaks": "flatpak_refs"
               },
               {
                 "image_repo": "quay.io/fedora-ostree-desktops",
@@ -50,6 +53,10 @@ on:
               {
                 "image_repo": "quay.io/fedora-ostree-desktops",
                 "flatpaks": "flatpak_refs"
+              },
+              {
+                "image_repo": "quay.io/fedora-ostree-desktops",
+                "version": "40"
               }
             ]
           }'
diff --git a/Makefile b/Makefile
index 20bc28d..9f85c58 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export install_pkg
 _IMAGE_REPO_ESCAPED        := $(subst /,\/,$(IMAGE_REPO))
 _IMAGE_REPO_DOUBLE_ESCAPED := $(subst \,\\\,$(_IMAGE_REPO_ESCAPED))
 _LORAX_ARGS                := 
-_LORAX_TEMPLATES           := $(call get_templates,install)
+export _LORAX_TEMPLATES    := $(call get_templates,install) lorax_templates/install_include_post.tmpl
 _REPO_FILES                := $(subst /etc/yum.repos.d,repos,$(REPOS))
 _TEMP_DIR                  := $(shell mktemp -d)
 _TEMPLATE_VARS             := ARCH IMAGE_NAME IMAGE_REPO _IMAGE_REPO_DOUBLE_ESCAPED _IMAGE_REPO_ESCAPED IMAGE_SIGNED IMAGE_TAG REPOS _RHEL VARIANT VERSION WEB_UI
@@ -35,7 +35,7 @@ _VOLID                     := $(firstword $(subst -, ,$(IMAGE_NAME)))-$(ARCH)-$(
 
 ifeq ($(findstring redhat.repo,$(REPOS)),redhat.repo)
 export _RHEL := true
-_LORAX_TEMPLATES += $(call get_templates,rhel)
+export _LORAX_TEMPLATES += $(call get_templates,rhel)
 else
 undefine _RHEL
 endif
@@ -53,17 +53,17 @@ _LORAX_ARGS += -i anaconda-webui
 endif
 
 ifneq ($(DNF_CACHE),)
-_LORAX_ARGS      += --cachedir $(DNF_CACHE)
-_LORAX_TEMPLATES += $(call get_templates,cache)
-_TEMPLATE_VARS   += DNF_CACHE
+       _LORAX_ARGS      += --cachedir $(DNF_CACHE)
+export _LORAX_TEMPLATES += $(call get_templates,cache)
+       _TEMPLATE_VARS   += DNF_CACHE
 endif
 
 ifneq ($(FLATPAK_DIR),)
-_FLATPAK_REPO_GPG := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^GPGKey=' | cut -d= -f2)
+       _FLATPAK_REPO_GPG := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^GPGKey=' | cut -d= -f2)
 export _FLATPAK_REPO_URL := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^URL=' | cut -d= -f2)
-_LORAX_ARGS      += -i flatpak-libs
-_LORAX_TEMPLATES += $(call get_templates,flatpak)
-_TEMPLATE_VARS   += FLATPAK_DIR FLATPAK_REMOTE_NAME FLATPAK_REMOTE_REFS FLATPAK_REMOTE_URL _FLATPAK_REPO_GPG _FLATPAK_REPO_URL
+       _LORAX_ARGS       += -i flatpak-libs
+export _LORAX_TEMPLATES  += $(call get_templates,flatpak)
+       _TEMPLATE_VARS    += FLATPAK_DIR FLATPAK_REMOTE_NAME FLATPAK_REMOTE_REFS FLATPAK_REMOTE_URL _FLATPAK_REPO_GPG _FLATPAK_REPO_URL
 else
 ifneq ($(FLATPAK_REMOTE_REFS_DIR),)
        COLLECTED_REFS      := $(foreach file,$(filter-out README.md Makefile,$(wildcard $(FLATPAK_REMOTE_REFS_DIR)/*)),$(shell cat $(file)))
@@ -71,19 +71,19 @@ export FLATPAK_REMOTE_REFS += $(sort $(COLLECTED_REFS))
 endif
 
 ifneq ($(FLATPAK_REMOTE_REFS),)
-_FLATPAK_REPO_GPG := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^GPGKey=' | cut -d= -f2)
+       _FLATPAK_REPO_GPG := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^GPGKey=' | cut -d= -f2)
 export _FLATPAK_REPO_URL := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^URL=' | cut -d= -f2)
-_LORAX_ARGS      += -i flatpak-libs
-_LORAX_TEMPLATES += $(call get_templates,flatpak) \
-					external/fedora-lorax-templates/ostree-based-installer/lorax-embed-flatpaks.tmpl
-_TEMPLATE_VARS   += FLATPAK_DIR FLATPAK_REMOTE_NAME FLATPAK_REMOTE_REFS FLATPAK_REMOTE_URL _FLATPAK_REPO_GPG _FLATPAK_REPO_URL
+       _LORAX_ARGS       += -i flatpak-libs
+export _LORAX_TEMPLATES  += $(call get_templates,flatpak) \
+							external/fedora-lorax-templates/ostree-based-installer/lorax-embed-flatpaks.tmpl
+       _TEMPLATE_VARS    += FLATPAK_DIR FLATPAK_REMOTE_NAME FLATPAK_REMOTE_REFS FLATPAK_REMOTE_URL _FLATPAK_REPO_GPG _FLATPAK_REPO_URL
 endif
 endif
 
 
 ifneq ($(SECURE_BOOT_KEY_URL),)
-_LORAX_TEMPLATES += $(call get_templates,secureboot)
-_TEMPLATE_VARS   += ENROLLMENT_PASSWORD
+export _LORAX_TEMPLATES += $(call get_templates,secureboot)
+       _TEMPLATE_VARS   += ENROLLMENT_PASSWORD
 endif
 
 _SUBDIRS := container external flatpak_refs lorax_templates repos xorriso test
diff --git a/lorax_templates/Makefile b/lorax_templates/Makefile
index d022767..b2e80e5 100644
--- a/lorax_templates/Makefile
+++ b/lorax_templates/Makefile
@@ -39,10 +39,14 @@ endef
 post_%.tmpl: scripts/post/%
 	$(call convert_post_to_tmpl,$*,usr/share/anaconda/post-scripts/$*.ks,true)
 
+install_include_post.tmpl:
+	echo '<%page />' > install_include_post.tmpl
+	for file in $(patsubst post_%.tmpl, %, $(filter post_%, $(notdir $(_LORAX_TEMPLATES)))); do echo "append usr/share/anaconda/interactive-defaults.ks \"%include /usr/share/anaconda/post-scripts/$${file}.ks\"" >> install_include_post.tmpl; done
+
 install-deps:
 
-FILES=$(wildcard post_*)
+FILES=$(wildcard post_*) install_include_post.tmpl
 clean:
 ifneq ($(FILES),)
 	rm -Rf $(FILES)
-endif
\ No newline at end of file
+endif
diff --git a/test/vm/Makefile b/test/vm/Makefile
index 99288cb..6578595 100644
--- a/test/vm/Makefile
+++ b/test/vm/Makefile
@@ -24,7 +24,7 @@ ansible_inventory:
 .PHONY: $(VM_TESTS) install-deps
 
 install-deps:
-	$(install_pkg) qemu qemu-utils xorriso qemu-system-x86 netcat socat jq ansible curl
+	$(install_pkg) qemu-system qemu-utils xorriso qemu-system-x86 ncat socat jq ansible curl
 
 files/mnt/iso:
 	$(if $(wildcard files/mnt),,mkdir files/mnt)
@@ -97,4 +97,4 @@ start_vm: install_os
 	fi
 	
 	echo "VM ready for tests at IP $(VM_IP):$(VM_PORT)"
-	echo $$QEMU_PID > start_vm
\ No newline at end of file
+	echo $$QEMU_PID > start_vm

From 91208e0329d2282a549eb4eaaf10c0ed8c5a33fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 May 2025 18:44:24 -0400
Subject: [PATCH 05/12] Bump docker/login-action from 3.3.0 to 3.4.0 (#160)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
---
 .github/workflows/build_container.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_container.yml b/.github/workflows/build_container.yml
index 57949bc..900cd43 100644
--- a/.github/workflows/build_container.yml
+++ b/.github/workflows/build_container.yml
@@ -97,7 +97,7 @@ jobs:
           labels: ${{ steps.meta.outputs.labels || steps.meta_pr.outputs.labels }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.4.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

From d77e9563739921c2f93de778d4fbad854f52d389 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 May 2025 20:44:40 -0400
Subject: [PATCH 06/12] Bump sigstore/cosign-installer from 3.7.0 to 3.8.2
 (#162)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
---
 .github/workflows/build_container.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_container.yml b/.github/workflows/build_container.yml
index 900cd43..615b8ea 100644
--- a/.github/workflows/build_container.yml
+++ b/.github/workflows/build_container.yml
@@ -123,7 +123,7 @@ jobs:
       
       - name: Install Cosign
         if: startsWith(github.ref, 'refs/tags/v')
-        uses: sigstore/cosign-installer@v3.7.0
+        uses: sigstore/cosign-installer@v3.8.2
 
       - name: Sign the images
         if: startsWith(github.ref, 'refs/tags/v')

From 6810b148ad076484005cd80ded8ba51c6621dd71 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 5 Oct 2025 18:24:07 -0400
Subject: [PATCH 07/12] Bump docker/login-action from 3.4.0 to 3.6.0 (#174)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/build_container.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_container.yml b/.github/workflows/build_container.yml
index 615b8ea..dc664e0 100644
--- a/.github/workflows/build_container.yml
+++ b/.github/workflows/build_container.yml
@@ -97,7 +97,7 @@ jobs:
           labels: ${{ steps.meta.outputs.labels || steps.meta_pr.outputs.labels }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3.4.0
+        uses: docker/login-action@v3.6.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

From 3b090e7c2eea3f73c65ac2790514a39816a0b3e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 5 Oct 2025 18:33:45 -0400
Subject: [PATCH 08/12] Bump sigstore/cosign-installer from 3.8.2 to 3.10.0
 (#173)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/build_container.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_container.yml b/.github/workflows/build_container.yml
index dc664e0..cf98730 100644
--- a/.github/workflows/build_container.yml
+++ b/.github/workflows/build_container.yml
@@ -123,7 +123,7 @@ jobs:
       
       - name: Install Cosign
         if: startsWith(github.ref, 'refs/tags/v')
-        uses: sigstore/cosign-installer@v3.8.2
+        uses: sigstore/cosign-installer@v3.10.0
 
       - name: Sign the images
         if: startsWith(github.ref, 'refs/tags/v')

From 33d0e5a5c241506b86b94277fa53537cc99e411a Mon Sep 17 00:00:00 2001
From: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
Date: Sun, 5 Oct 2025 17:58:17 -0500
Subject: [PATCH 09/12] Add tests for Fedora 43 (#175)

---
 .github/workflows/build_vars.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_vars.yml b/.github/workflows/build_vars.yml
index e74c6ca..06c5eaa 100644
--- a/.github/workflows/build_vars.yml
+++ b/.github/workflows/build_vars.yml
@@ -9,9 +9,9 @@ on:
         value: '
           {
             "version": [
-              "40",
               "41",
-              "42"
+              "42",
+              "43"
             ],
             "flatpaks": [
               "false",

From e310904cc7086ffd73ca14b1abf74f9efb90ea12 Mon Sep 17 00:00:00 2001
From: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
Date: Wed, 8 Oct 2025 11:41:09 -0400
Subject: [PATCH 10/12] Fix documentation about iso_path (#177)

---
 README.md        | 4 ++--
 docs/_Sidebar.md | 3 ++-
 docs/home.md     | 3 ++-
 docs/usage.md    | 6 +++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 26a3de9..fdea723 100644
--- a/README.md
+++ b/README.md
@@ -29,8 +29,8 @@ This action is designed to be called from a GitHub workflow using the following
   with:
     name: ${{ steps.build.outputs.iso_name }}
     path: |
-      ${{ steps.build.outputs.iso_path }}
-      ${{ steps.build.outputs.iso_path }}-CHECKSUM
+      ${{ steps.build.outputs.iso_path }}/${{ steps.build.outputs.iso_name }}
+      ${{ steps.build.outputs.iso_path }}/${{ steps.build.outputs.iso_name }}-CHECKSUM
     if-no-files-found: error
     retention-days: 0
     compression-level: 0
diff --git a/docs/_Sidebar.md b/docs/_Sidebar.md
index 300a54e..7e637e7 100644
--- a/docs/_Sidebar.md
+++ b/docs/_Sidebar.md
@@ -1,4 +1,5 @@
 - [Home](home.md)
+- [Usage](usage.md)
 - Development
   - [Using the Makefile](development/makefile.md)
   - [Using the Container](development/container.md)
@@ -7,4 +8,4 @@
 - Examples
   - [Adding Flatpaks](examples/adding-flatpaks.md)
 
-- [Known Errors](known_errors.md)
\ No newline at end of file
+- [Known Errors](known_errors.md)
diff --git a/docs/home.md b/docs/home.md
index e8b6e75..f7e2096 100644
--- a/docs/home.md
+++ b/docs/home.md
@@ -2,6 +2,7 @@ Welcome to the build-container-installer wiki!
 
 ## Index
 
+- [Usage](usage.md)
 - Development
   - [Using the Makefile](development/makefile.md)
   - [Using the Container](development/container.md)
@@ -10,4 +11,4 @@ Welcome to the build-container-installer wiki!
 - Examples
   - [Adding Flatpaks](examples/adding-flatpaks.md)
 
-- [Known Errors](known_errors.md)
\ No newline at end of file
+- [Known Errors](known_errors.md)
diff --git a/docs/usage.md b/docs/usage.md
index 9f6a83f..9ffeb8e 100644
--- a/docs/usage.md
+++ b/docs/usage.md
@@ -22,8 +22,8 @@ This action is designed to be called from a GitHub workflow using the following
   with:
     name: ${{ steps.build.outputs.iso_name }}
     path: |
-      ${{ steps.build.outputs.iso_path }}
-      ${{ steps.build.outputs.iso_path }}-CHECKSUM
+      ${{ steps.build.outputs.iso_path }}/${{ steps.build.outputs.iso_name }}
+      ${{ steps.build.outputs.iso_path }}/${{ steps.build.outputs.iso_name }}-CHECKSUM
     if-no-files-found: error
     retention-days: 0
     compression-level: 0
@@ -65,4 +65,4 @@ Variant will be the third item in the package name. Example: `fedora-release-kin
 | Variable | Description                             | Usage                                            |
 | -------- | ----------------------------------------| ------------------------------------------------ |
 | iso_name | The name of the resulting .iso          | ${{ steps.YOUR_ID_FOR_ACTION.outputs.iso_name }} |
-| iso_path | The name and path of the resulting .iso | ${{ steps.YOUR_ID_FOR_ACTION.outputs.iso_name }} |
\ No newline at end of file
+| iso_path | The path to the resulting .iso          | ${{ steps.YOUR_ID_FOR_ACTION.outputs.iso_path }} |

From c9ef3de33236e66781ec37bd0485e8009eaefe24 Mon Sep 17 00:00:00 2001
From: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
Date: Wed, 8 Oct 2025 13:04:06 -0400
Subject: [PATCH 11/12] Upgrade base image to 42 (#176)

---
 .github/workflows/build_iso.yml       | 6 +++---
 .github/workflows/build_vars.yml      | 4 ++--
 .github/workflows/test_deployment.yml | 6 +++---
 .github/workflows/test_iso.yml        | 8 ++++----
 Containerfile                         | 4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml
index 3c2316d..2964d72 100644
--- a/.github/workflows/build_iso.yml
+++ b/.github/workflows/build_iso.yml
@@ -53,7 +53,7 @@ jobs:
         id: jobs
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          job_name: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }}, ${{ matrix.image_name }})"
+          job_name: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }})"
           per_page: 100
 
       - name: Set status
@@ -62,7 +62,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           status: pending
-          context: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }}, ${{ matrix.image_name }})"
+          context: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }})"
           sha: ${{ env.sha }}
           targetUrl: ${{ steps.jobs.outputs.html_url }}
 
@@ -138,7 +138,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           status: ${{ job.status }}
-          context: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }}, ${{ matrix.image_name }})"
+          context: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }})"
           sha: ${{ env.sha }}
           targetUrl: ${{ steps.jobs.outputs.html_url }}
 
diff --git a/.github/workflows/build_vars.yml b/.github/workflows/build_vars.yml
index 06c5eaa..8a60657 100644
--- a/.github/workflows/build_vars.yml
+++ b/.github/workflows/build_vars.yml
@@ -55,8 +55,8 @@ on:
                 "flatpaks": "flatpak_refs"
               },
               {
-                "image_repo": "quay.io/fedora-ostree-desktops",
-                "version": "40"
+                "image_repo": "ghcr.io/ublue-os",
+                "version": "43"
               }
             ]
           }'
diff --git a/.github/workflows/test_deployment.yml b/.github/workflows/test_deployment.yml
index ec85345..f343313 100644
--- a/.github/workflows/test_deployment.yml
+++ b/.github/workflows/test_deployment.yml
@@ -52,7 +52,7 @@ jobs:
         id: jobs
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          job_name: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }}, ${{ matrix.image_name }})"
+          job_name: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }})"
           per_page: 100
 
       - name: Set status
@@ -61,7 +61,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           status: pending
-          context: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }}, ${{ matrix.image_name }})"
+          context: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }})"
           sha: ${{ env.sha }}
           targetUrl: ${{ steps.jobs.outputs.html_url }}
 
@@ -107,6 +107,6 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           status: ${{ job.status }}
-          context: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }}, ${{ matrix.image_name }})"
+          context: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }})"
           sha: ${{ env.sha }}
           targetUrl: ${{ steps.jobs.outputs.html_url }}
diff --git a/.github/workflows/test_iso.yml b/.github/workflows/test_iso.yml
index 4697e30..c3b5103 100644
--- a/.github/workflows/test_iso.yml
+++ b/.github/workflows/test_iso.yml
@@ -52,7 +52,7 @@ jobs:
         id: jobs
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          job_name: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }}, ${{ matrix.image_name }})"
+          job_name: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }})"
           per_page: 100
 
       - name: Set status
@@ -61,7 +61,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           status: pending
-          context: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }}, ${{ matrix.image_name }})"
+          context: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }})"
           sha: ${{ env.sha }}
           targetUrl: ${{ steps.jobs.outputs.html_url }}
 
@@ -98,6 +98,6 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           status: ${{ job.status }}
-          context: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }}, ${{ matrix.image_name }})"
+          context: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }}, ${{ matrix.flatpaks }}, ${{ matrix.image_repo }})"
           sha: ${{ env.sha }}
-          targetUrl: ${{ steps.jobs.outputs.html_url }}
\ No newline at end of file
+          targetUrl: ${{ steps.jobs.outputs.html_url }}
diff --git a/Containerfile b/Containerfile
index a0678e4..18b844b 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,6 +1,6 @@
-FROM fedora:40
+FROM fedora:42
 
-ARG VERSION=39
+ARG VERSION=42
 
 ENV ARCH="x86_64"
 ENV IMAGE_NAME="base"

From 4ab1e18f8346cea28b84a8c16fca7cfece611ef0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 31 Oct 2025 19:26:02 -0400
Subject: [PATCH 12/12] Bump actions/checkout from 4 to 5 (#171)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
---
 .github/workflows/build_container.yml | 2 +-
 .github/workflows/build_iso.yml       | 2 +-
 .github/workflows/test_deployment.yml | 2 +-
 .github/workflows/test_iso.yml        | 2 +-
 .github/workflows/test_repo.yml       | 2 +-
 .github/workflows/update_wiki.yml     | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build_container.yml b/.github/workflows/build_container.yml
index cf98730..53f412d 100644
--- a/.github/workflows/build_container.yml
+++ b/.github/workflows/build_container.yml
@@ -26,7 +26,7 @@ jobs:
       statuses: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
           fetch-depth: 0
diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml
index 2964d72..6cd33ef 100644
--- a/.github/workflows/build_iso.yml
+++ b/.github/workflows/build_iso.yml
@@ -32,7 +32,7 @@ jobs:
       matrix: ${{ fromJson(needs.load_vars.outputs.BUILD_MATRIX) }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
 
diff --git a/.github/workflows/test_deployment.yml b/.github/workflows/test_deployment.yml
index f343313..8738ded 100644
--- a/.github/workflows/test_deployment.yml
+++ b/.github/workflows/test_deployment.yml
@@ -31,7 +31,7 @@ jobs:
       matrix: ${{ fromJson(needs.load_vars.outputs.BUILD_MATRIX) }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
 
diff --git a/.github/workflows/test_iso.yml b/.github/workflows/test_iso.yml
index c3b5103..049fc11 100644
--- a/.github/workflows/test_iso.yml
+++ b/.github/workflows/test_iso.yml
@@ -31,7 +31,7 @@ jobs:
       matrix: ${{ fromJson(needs.load_vars.outputs.BUILD_MATRIX) }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
 
diff --git a/.github/workflows/test_repo.yml b/.github/workflows/test_repo.yml
index 4c658e3..59071c0 100644
--- a/.github/workflows/test_repo.yml
+++ b/.github/workflows/test_repo.yml
@@ -20,7 +20,7 @@ jobs:
       contents: read
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         
       - name: Run test
         run: |
diff --git a/.github/workflows/update_wiki.yml b/.github/workflows/update_wiki.yml
index a9bdf15..fce015c 100644
--- a/.github/workflows/update_wiki.yml
+++ b/.github/workflows/update_wiki.yml
@@ -18,10 +18,10 @@ jobs:
         run: |
           sudo apt install -y make rsync
       # Checkout Main Repo
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       # Checkout Wiki Repo
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           repository: ${{github.repository}}.wiki
           persist-credentials: true