From 207d61d724a22747786ecd71c2dacd034cb4eb4c Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 14:17:56 -0500
Subject: [PATCH 01/26] Init forgejo actions

---
 .forgejo/workflows/build-image.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 .forgejo/workflows/build-image.yml

diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
new file mode 100644
index 0000000..4cff900
--- /dev/null
+++ b/.forgejo/workflows/build-image.yml
@@ -0,0 +1,20 @@
+on: [push]
+
+jobs:
+  build-image:
+    runs-on: docker
+    container:
+      image: node:18-bookworm
+    steps:
+      - name: Repository Checkout
+        uses: https://gitea.angry.im/actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Mask Secrets
+        run: 'echo "::add-mask::${{ secret.FORGEJO_TOKEN }}'
+
+      - name: Setup podman
+        run: |
+          apt-get update && apt-get install -y podman
+          podman login gitea.angry.im --password ${{ secret.FORGEJO_TOKEN }}

From c3027f071ddedc9ef5ddc3d5076fc382a9c29597 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 14:19:38 -0500
Subject: [PATCH 02/26] Fix multi-line command

---
 .forgejo/workflows/build-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
index 4cff900..4d4e7d6 100644
--- a/.forgejo/workflows/build-image.yml
+++ b/.forgejo/workflows/build-image.yml
@@ -16,5 +16,5 @@ jobs:
 
       - name: Setup podman
         run: |
-          apt-get update && apt-get install -y podman
+          apt-get update && apt-get install -y podman && \
           podman login gitea.angry.im --password ${{ secret.FORGEJO_TOKEN }}

From 3898c23f13b7d00a281c20e17d61410433938860 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 14:22:19 -0500
Subject: [PATCH 03/26] Test

---
 .forgejo/workflows/build-image.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
index 4d4e7d6..da7e1e6 100644
--- a/.forgejo/workflows/build-image.yml
+++ b/.forgejo/workflows/build-image.yml
@@ -16,5 +16,7 @@ jobs:
 
       - name: Setup podman
         run: |
-          apt-get update && apt-get install -y podman && \
+          id -a
+          apt-get update
+          apt-get install -y podman
           podman login gitea.angry.im --password ${{ secret.FORGEJO_TOKEN }}

From fc9a92c5aee8bcba6c6d320e5f880864e88f09ce Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 14:23:18 -0500
Subject: [PATCH 04/26] Test

---
 .forgejo/workflows/build-image.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
index da7e1e6..7c22ba4 100644
--- a/.forgejo/workflows/build-image.yml
+++ b/.forgejo/workflows/build-image.yml
@@ -19,4 +19,3 @@ jobs:
           id -a
           apt-get update
           apt-get install -y podman
-          podman login gitea.angry.im --password ${{ secret.FORGEJO_TOKEN }}

From e569f1b2a68daf61365c2fb1fd0a8d16558fe668 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 14:25:22 -0500
Subject: [PATCH 05/26] Fix podman setup (?)

---
 .forgejo/workflows/build-image.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
index 7c22ba4..579f02a 100644
--- a/.forgejo/workflows/build-image.yml
+++ b/.forgejo/workflows/build-image.yml
@@ -12,10 +12,10 @@ jobs:
           submodules: recursive
 
       - name: Mask Secrets
-        run: 'echo "::add-mask::${{ secret.FORGEJO_TOKEN }}'
+        run: 'echo "::add-mask::${{ secrets.FORGEJO_TOKEN }}'
 
       - name: Setup podman
         run: |
-          id -a
           apt-get update
           apt-get install -y podman
+          podman login gitea.angry.im --password ${{ secrets.FORGEJO_TOKEN }}

From 64b411906e55dd526b087533c2578cc232c1fcff Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 14:26:10 -0500
Subject: [PATCH 06/26] Fix syntax

---
 .forgejo/workflows/build-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
index 579f02a..49304f6 100644
--- a/.forgejo/workflows/build-image.yml
+++ b/.forgejo/workflows/build-image.yml
@@ -12,7 +12,7 @@ jobs:
           submodules: recursive
 
       - name: Mask Secrets
-        run: 'echo "::add-mask::${{ secrets.FORGEJO_TOKEN }}'
+        run: 'echo "::add-mask::${{ secrets.FORGEJO_TOKEN }}"'
 
       - name: Setup podman
         run: |

From 9e0a2535d3a0c80c8c385b572aa26ac74e2d9f2f Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 14:27:06 -0500
Subject: [PATCH 07/26] Add username for podman

---
 .forgejo/workflows/build-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
index 49304f6..62afebb 100644
--- a/.forgejo/workflows/build-image.yml
+++ b/.forgejo/workflows/build-image.yml
@@ -18,4 +18,4 @@ jobs:
         run: |
           apt-get update
           apt-get install -y podman
-          podman login gitea.angry.im --password ${{ secrets.FORGEJO_TOKEN }}
+          podman login gitea.angry.im --username PeterCxy --password ${{ secrets.FORGEJO_TOKEN }}

From 69c32bb4f3f65a5d975ab3add74f48da26ab2060 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 14:31:02 -0500
Subject: [PATCH 08/26] Test add image build & push

---
 .forgejo/workflows/build-image.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
index 62afebb..e28a1a6 100644
--- a/.forgejo/workflows/build-image.yml
+++ b/.forgejo/workflows/build-image.yml
@@ -19,3 +19,6 @@ jobs:
           apt-get update
           apt-get install -y podman
           podman login gitea.angry.im --username PeterCxy --password ${{ secrets.FORGEJO_TOKEN }}
+
+      - name: Build & Push
+        run: ./build-image.sh element-web

From a0f1b19adfe00692eda7e7f3b0bbf4947ad9ac60 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 14:33:16 -0500
Subject: [PATCH 09/26] Test podman

---
 .forgejo/workflows/build-image.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
index e28a1a6..4333c3c 100644
--- a/.forgejo/workflows/build-image.yml
+++ b/.forgejo/workflows/build-image.yml
@@ -20,5 +20,8 @@ jobs:
           apt-get install -y podman
           podman login gitea.angry.im --username PeterCxy --password ${{ secrets.FORGEJO_TOKEN }}
 
+      - name: Confirm Podman works
+        run: podman run --rm hello-world
+
       - name: Build & Push
         run: ./build-image.sh element-web

From 7b6b76036d248a222edf90753dd146368f5f96aa Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 14:37:14 -0500
Subject: [PATCH 10/26] Test

---
 .forgejo/workflows/build-image.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
index 4333c3c..665460d 100644
--- a/.forgejo/workflows/build-image.yml
+++ b/.forgejo/workflows/build-image.yml
@@ -16,6 +16,7 @@ jobs:
 
       - name: Setup podman
         run: |
+          id -a
           apt-get update
           apt-get install -y podman
           podman login gitea.angry.im --username PeterCxy --password ${{ secrets.FORGEJO_TOKEN }}

From 294bacdada5009c94a10419a6dc8fc0407e8edbb Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 14:40:58 -0500
Subject: [PATCH 11/26] Fixup subuid / subgid and fuse mount

---
 .forgejo/workflows/build-image.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
index 665460d..c44107b 100644
--- a/.forgejo/workflows/build-image.yml
+++ b/.forgejo/workflows/build-image.yml
@@ -5,22 +5,25 @@ jobs:
     runs-on: docker
     container:
       image: node:18-bookworm
+      volumes:
+        - /dev/fuse:/dev/fuse
     steps:
       - name: Repository Checkout
         uses: https://gitea.angry.im/actions/checkout@v3
         with:
           submodules: recursive
 
-      - name: Mask Secrets
-        run: 'echo "::add-mask::${{ secrets.FORGEJO_TOKEN }}"'
-
       - name: Setup podman
         run: |
-          id -a
           apt-get update
           apt-get install -y podman
           podman login gitea.angry.im --username PeterCxy --password ${{ secrets.FORGEJO_TOKEN }}
 
+      - name: Fixup subuid/subgid
+        run: |
+          echo 'root:1:999' > /etc/subuid
+          echo 'root:1:999' > /etc/subgid
+
       - name: Confirm Podman works
         run: podman run --rm hello-world
 

From d5b1dd1034ce0c0edc396420218098ed4ab434bb Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 14:43:31 -0500
Subject: [PATCH 12/26] Try using alpine for newer podman (without
 fuse-overlayfs)

---
 .forgejo/workflows/build-image.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
index c44107b..8b998b3 100644
--- a/.forgejo/workflows/build-image.yml
+++ b/.forgejo/workflows/build-image.yml
@@ -4,9 +4,7 @@ jobs:
   build-image:
     runs-on: docker
     container:
-      image: node:18-bookworm
-      volumes:
-        - /dev/fuse:/dev/fuse
+      image: node:18-alpine
     steps:
       - name: Repository Checkout
         uses: https://gitea.angry.im/actions/checkout@v3
@@ -15,8 +13,7 @@ jobs:
 
       - name: Setup podman
         run: |
-          apt-get update
-          apt-get install -y podman
+          apk add podman
           podman login gitea.angry.im --username PeterCxy --password ${{ secrets.FORGEJO_TOKEN }}
 
       - name: Fixup subuid/subgid

From 76019f59df21479be621669eda787f916ffa36d4 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 14:45:06 -0500
Subject: [PATCH 13/26] Add git setup for alpine

---
 .forgejo/workflows/build-image.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
index 8b998b3..0a90051 100644
--- a/.forgejo/workflows/build-image.yml
+++ b/.forgejo/workflows/build-image.yml
@@ -6,14 +6,12 @@ jobs:
     container:
       image: node:18-alpine
     steps:
-      - name: Repository Checkout
-        uses: https://gitea.angry.im/actions/checkout@v3
-        with:
-          submodules: recursive
+      - name: Install packages
+        run: |
+          apk add git podman
 
       - name: Setup podman
         run: |
-          apk add podman
           podman login gitea.angry.im --username PeterCxy --password ${{ secrets.FORGEJO_TOKEN }}
 
       - name: Fixup subuid/subgid
@@ -21,6 +19,11 @@ jobs:
           echo 'root:1:999' > /etc/subuid
           echo 'root:1:999' > /etc/subgid
 
+      - name: Repository Checkout
+        uses: https://gitea.angry.im/actions/checkout@v3
+        with:
+          submodules: recursive
+
       - name: Confirm Podman works
         run: podman run --rm hello-world
 

From 68f2d6830a850dbc6c3b012c8b5212a3e6170235 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 14:48:20 -0500
Subject: [PATCH 14/26] Use anonymous volume for guest /var/lib/containers

---
 .forgejo/workflows/build-image.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
index 0a90051..ac0da8e 100644
--- a/.forgejo/workflows/build-image.yml
+++ b/.forgejo/workflows/build-image.yml
@@ -5,6 +5,8 @@ jobs:
     runs-on: docker
     container:
       image: node:18-alpine
+      volumes:
+        - /var/lib/containers
     steps:
       - name: Install packages
         run: |

From 17b18b01bb382e800791b5b6cb5ce3ba27ff5a63 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 14:50:13 -0500
Subject: [PATCH 15/26] Fix subuid/subgid before testing podman

---
 .forgejo/workflows/build-image.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
index ac0da8e..47acb3f 100644
--- a/.forgejo/workflows/build-image.yml
+++ b/.forgejo/workflows/build-image.yml
@@ -12,15 +12,15 @@ jobs:
         run: |
           apk add git podman
 
-      - name: Setup podman
-        run: |
-          podman login gitea.angry.im --username PeterCxy --password ${{ secrets.FORGEJO_TOKEN }}
-
       - name: Fixup subuid/subgid
         run: |
           echo 'root:1:999' > /etc/subuid
           echo 'root:1:999' > /etc/subgid
 
+      - name: Setup podman
+        run: |
+          podman login gitea.angry.im --username PeterCxy --password ${{ secrets.FORGEJO_TOKEN }}
+
       - name: Repository Checkout
         uses: https://gitea.angry.im/actions/checkout@v3
         with:

From d66609a954ea2aba8854ebb70104f5b7ae99e267 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 14:53:49 -0500
Subject: [PATCH 16/26] Use official podman images

---
 .forgejo/workflows/build-image.yml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
index 47acb3f..064a330 100644
--- a/.forgejo/workflows/build-image.yml
+++ b/.forgejo/workflows/build-image.yml
@@ -4,18 +4,12 @@ jobs:
   build-image:
     runs-on: docker
     container:
-      image: node:18-alpine
-      volumes:
-        - /var/lib/containers
+      image: quay.io/podman/stable
     steps:
       - name: Install packages
         run: |
-          apk add git podman
-
-      - name: Fixup subuid/subgid
-        run: |
-          echo 'root:1:999' > /etc/subuid
-          echo 'root:1:999' > /etc/subgid
+          dnf -y module install nodejs:18/common
+          dnf -y install git
 
       - name: Setup podman
         run: |

From 06886b43017f9f78566175d55b784374448a3a03 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 14:56:31 -0500
Subject: [PATCH 17/26] Revert "Use official podman images"

This reverts commit d66609a954ea2aba8854ebb70104f5b7ae99e267.
---
 .forgejo/workflows/build-image.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
index 064a330..47acb3f 100644
--- a/.forgejo/workflows/build-image.yml
+++ b/.forgejo/workflows/build-image.yml
@@ -4,12 +4,18 @@ jobs:
   build-image:
     runs-on: docker
     container:
-      image: quay.io/podman/stable
+      image: node:18-alpine
+      volumes:
+        - /var/lib/containers
     steps:
       - name: Install packages
         run: |
-          dnf -y module install nodejs:18/common
-          dnf -y install git
+          apk add git podman
+
+      - name: Fixup subuid/subgid
+        run: |
+          echo 'root:1:999' > /etc/subuid
+          echo 'root:1:999' > /etc/subgid
 
       - name: Setup podman
         run: |

From 87ee8b7eba3457b263cbbadc1d4af8344afa1bee Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 14:57:13 -0500
Subject: [PATCH 18/26] Switch to Debian Trixie

---
 .forgejo/workflows/build-image.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
index 47acb3f..2c984b7 100644
--- a/.forgejo/workflows/build-image.yml
+++ b/.forgejo/workflows/build-image.yml
@@ -4,13 +4,14 @@ jobs:
   build-image:
     runs-on: docker
     container:
-      image: node:18-alpine
+      image: debian:trixie
       volumes:
         - /var/lib/containers
     steps:
       - name: Install packages
         run: |
-          apk add git podman
+          apt-get -y update
+          apt-get -y install git nodejs podman
 
       - name: Fixup subuid/subgid
         run: |

From bba62748695667ecc9ac658ecedf4a257a71fe5b Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 15:05:45 -0500
Subject: [PATCH 19/26] Revert "Switch to Debian Trixie"

This reverts commit 87ee8b7eba3457b263cbbadc1d4af8344afa1bee.
---
 .forgejo/workflows/build-image.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
index 2c984b7..47acb3f 100644
--- a/.forgejo/workflows/build-image.yml
+++ b/.forgejo/workflows/build-image.yml
@@ -4,14 +4,13 @@ jobs:
   build-image:
     runs-on: docker
     container:
-      image: debian:trixie
+      image: node:18-alpine
       volumes:
         - /var/lib/containers
     steps:
       - name: Install packages
         run: |
-          apt-get -y update
-          apt-get -y install git nodejs podman
+          apk add git podman
 
       - name: Fixup subuid/subgid
         run: |

From 037fe95b379d4d71c9ef05bf6a1d5a5e6a17c996 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 15:05:48 -0500
Subject: [PATCH 20/26] Reapply "Use official podman images"

This reverts commit 06886b43017f9f78566175d55b784374448a3a03.
---
 .forgejo/workflows/build-image.yml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
index 47acb3f..064a330 100644
--- a/.forgejo/workflows/build-image.yml
+++ b/.forgejo/workflows/build-image.yml
@@ -4,18 +4,12 @@ jobs:
   build-image:
     runs-on: docker
     container:
-      image: node:18-alpine
-      volumes:
-        - /var/lib/containers
+      image: quay.io/podman/stable
     steps:
       - name: Install packages
         run: |
-          apk add git podman
-
-      - name: Fixup subuid/subgid
-        run: |
-          echo 'root:1:999' > /etc/subuid
-          echo 'root:1:999' > /etc/subgid
+          dnf -y module install nodejs:18/common
+          dnf -y install git
 
       - name: Setup podman
         run: |

From 2319132092066f9112ed7fcd1ccccfc560b4f2d7 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 15:06:30 -0500
Subject: [PATCH 21/26] Rework usage of podman image

---
 .forgejo/workflows/build-image.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
index 064a330..aa81d0b 100644
--- a/.forgejo/workflows/build-image.yml
+++ b/.forgejo/workflows/build-image.yml
@@ -6,14 +6,13 @@ jobs:
     container:
       image: quay.io/podman/stable
     steps:
-      - name: Install packages
+      - name: Install additional packages
         run: |
-          dnf -y module install nodejs:18/common
-          dnf -y install git
+          dnf -y install git nodejs
 
       - name: Setup podman
         run: |
-          podman login gitea.angry.im --username PeterCxy --password ${{ secrets.FORGEJO_TOKEN }}
+          sudo -u podman podman login gitea.angry.im --username PeterCxy --password ${{ secrets.FORGEJO_TOKEN }}
 
       - name: Repository Checkout
         uses: https://gitea.angry.im/actions/checkout@v3
@@ -21,7 +20,7 @@ jobs:
           submodules: recursive
 
       - name: Confirm Podman works
-        run: podman run --rm hello-world
+        run: sudo -u podman podman run --rm hello-world
 
       - name: Build & Push
-        run: ./build-image.sh element-web
+        run: sudo -u podman ./build-image.sh element-web

From c88c7f2499c87888094b06f2b55d861c61780908 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 15:09:22 -0500
Subject: [PATCH 22/26] Refer to a fixed podman image version

---
 .forgejo/workflows/build-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
index aa81d0b..9161a3f 100644
--- a/.forgejo/workflows/build-image.yml
+++ b/.forgejo/workflows/build-image.yml
@@ -4,7 +4,7 @@ jobs:
   build-image:
     runs-on: docker
     container:
-      image: quay.io/podman/stable
+      image: quay.io/podman/stable:v4.9.0
     steps:
       - name: Install additional packages
         run: |

From 249d882272c3ac75829be375dd67c14968959019 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 15:13:37 -0500
Subject: [PATCH 23/26] Test changed-files action

---
 .forgejo/workflows/build-image.yml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
index 9161a3f..f058e81 100644
--- a/.forgejo/workflows/build-image.yml
+++ b/.forgejo/workflows/build-image.yml
@@ -19,8 +19,16 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Confirm Podman works
-        run: sudo -u podman podman run --rm hello-world
+      - name: Detect Directory Changes
+        id: changed-dirs
+        uses: https://github.com/tj-actions/changed-files@v42
+        with:
+          dir_names: 'true'
 
       - name: Build & Push
-        run: sudo -u podman ./build-image.sh element-web
+        env:
+          ALL_CHANGED_DIRS: ${{ steps.changed-dirs.outputs.all_changed_files }}
+        run: |
+          for file in ${ALL_CHANGED_DIRS}; do
+            echo "sudo -u podman ./build-image.sh ${file}"
+          done

From c63bada17066cfed7b2268b24da5a9d5bcacd27b Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 15:20:19 -0500
Subject: [PATCH 24/26] Configure changed-files plugin properly

---
 .forgejo/workflows/build-image.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
index f058e81..ccfdee3 100644
--- a/.forgejo/workflows/build-image.yml
+++ b/.forgejo/workflows/build-image.yml
@@ -24,8 +24,14 @@ jobs:
         uses: https://github.com/tj-actions/changed-files@v42
         with:
           dir_names: 'true'
+          dir_names_max_depth: '1'
+          dir_names_exclude_current_dir: 'true'
+          files_ignore: |
+            .forgejo/**
+            build-image.sh
 
       - name: Build & Push
+        if: ${{ steps.changed-dirs.all_changed_files_count != '0' }}
         env:
           ALL_CHANGED_DIRS: ${{ steps.changed-dirs.outputs.all_changed_files }}
         run: |

From 7756b9804a3a1530cbad6dfab4d7a11b687e3de0 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 15:23:44 -0500
Subject: [PATCH 25/26] Actually build images

---
 .forgejo/workflows/build-image.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
index ccfdee3..5ace49f 100644
--- a/.forgejo/workflows/build-image.yml
+++ b/.forgejo/workflows/build-image.yml
@@ -36,5 +36,6 @@ jobs:
           ALL_CHANGED_DIRS: ${{ steps.changed-dirs.outputs.all_changed_files }}
         run: |
           for file in ${ALL_CHANGED_DIRS}; do
-            echo "sudo -u podman ./build-image.sh ${file}"
+            echo "---- Building ${file} ----"
+            sudo -u podman ./build-image.sh ${file}
           done

From f66636aa07a8562c92b6394a036ccbcac2a877f3 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 15 Feb 2024 15:23:52 -0500
Subject: [PATCH 26/26] element-web: Uprev to v1.11.58

---
 element-web/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/element-web/Dockerfile b/element-web/Dockerfile
index 3a8aed5..6459f0c 100644
--- a/element-web/Dockerfile
+++ b/element-web/Dockerfile
@@ -1,4 +1,4 @@
-ARG ELEMENT_VER=v1.11.57
+ARG ELEMENT_VER=v1.11.58
 
 FROM debian:11 AS builder