From fa8203410f60425f1f7bef1330c256a11a92bbdb Mon Sep 17 00:00:00 2001
From: sharpenedblade <sharpenedblade@proton.me>
Date: Sat, 16 Mar 2024 15:18:09 -0700
Subject: [PATCH 1/4] Update container to fedora 40 beta

---
 .github/workflows/build-image.yml | 6 +++---
 fedora-dev/Containerfile          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 7eccd33..9e5b611 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -21,13 +21,13 @@ jobs:
         uses: redhat-actions/buildah-build@v2
         with:
           image: ${{ env.IMAGE_NAME }}
-          tags: latest ${{ github.sha }}
+          tags: 40 ${{ github.sha }}
           context: ./${{ env.IMAGE_NAME }}
           containerfiles: |
             ${{ env.IMAGE_NAME }}/Containerfile
 
       - name: Log in to ghcr.io
-        if: github.ref == 'refs/heads/main'
+        if: github.ref == 'refs/heads/f40'
         uses: redhat-actions/podman-login@v1
         with:
           registry: ${{ env.REGISTRY }}
@@ -35,7 +35,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Push image to ghcr.io
-        if: github.ref == 'refs/heads/main'
+        if: github.ref == 'refs/heads/f40'
         uses: redhat-actions/push-to-registry@v2
         with:
           image: ${{ steps.build-image.outputs.image }}
diff --git a/fedora-dev/Containerfile b/fedora-dev/Containerfile
index 0d27f06..b8128ff 100644
--- a/fedora-dev/Containerfile
+++ b/fedora-dev/Containerfile
@@ -1,4 +1,4 @@
-FROM fedora:39
+FROM fedora:40
 SHELL ["/usr/bin/bash", "-c"]
 
 RUN dnf install --quiet -y \

From 5ce55cc8aa70a4cd32785cdca3f1b7704853e079 Mon Sep 17 00:00:00 2001
From: sharpenedblade <sharpenedblade@proton.me>
Date: Mon, 18 Mar 2024 23:17:53 -0700
Subject: [PATCH 2/4] Add xml2dict dep

---
 fedora-dev/Containerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fedora-dev/Containerfile b/fedora-dev/Containerfile
index b8128ff..f2ae041 100644
--- a/fedora-dev/Containerfile
+++ b/fedora-dev/Containerfile
@@ -4,6 +4,7 @@ SHELL ["/usr/bin/bash", "-c"]
 RUN dnf install --quiet -y \
     koji \
     git \
+    python-xmltodict \
     rpmdevtools \
     rpm-sign \
     mock \

From d76fffa5a67df5a0405e5dcb92f73ed3b8ccba8f Mon Sep 17 00:00:00 2001
From: sharpenedblade <sharpenedblade@proton.me>
Date: Tue, 19 Mar 2024 15:08:21 -0700
Subject: [PATCH 3/4] Enable CI

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

diff --git a/.github/workflows/fedora-dev.yml b/.github/workflows/fedora-dev.yml
index c98758a..703fc1a 100644
--- a/.github/workflows/fedora-dev.yml
+++ b/.github/workflows/fedora-dev.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - f40
 jobs:
   build-image:
     uses: ./.github/workflows/build-image.yml

From b54e495fdb44d225d6984bc1943ccc85ae780218 Mon Sep 17 00:00:00 2001
From: sharpenedblade <sharpenedblade@proton.me>
Date: Sat, 30 Mar 2024 00:10:39 -0700
Subject: [PATCH 4/4] Rebuild container