From 6bcde235018315f271c0b15b2f23d976f94f0179 Mon Sep 17 00:00:00 2001
From: Don <32144818+Don-Swanson@users.noreply.github.com>
Date: Wed, 26 Nov 2025 15:39:23 -0600
Subject: [PATCH 1/5] Update buildx.yml

---
 .github/workflows/buildx.yml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml
index 85a451c..fc854bc 100644
--- a/.github/workflows/buildx.yml
+++ b/.github/workflows/buildx.yml
@@ -3,7 +3,7 @@ name: buildx
 on:
   workflow_run:
     workflows: ["docker_main"]
-    branches: [main]
+    branches: [main, updates]
     types:
       - completed
   push:
@@ -50,6 +50,17 @@ jobs:
       #     docker buildx build --push \
       #       --tag ghcr.io/benbusby/whoogle-search:latest \
       #       --platform linux/amd64,linux/arm64 .
+      - name: build and push updates branch (update-testing tag)
+        if: github.event.workflow_run.head_branch == 'updates' && github.event.workflow_run.conclusion == 'success' && (github.actor == 'benbusby' || github.actor == 'Don-Swanson')
+        run: |
+          docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+          docker buildx ls
+          docker buildx build --push \
+            --tag benbusby/whoogle-search:update-testing \
+            --platform linux/amd64,linux/arm/v7,linux/arm64 .
+          docker buildx build --push \
+            --tag ghcr.io/benbusby/whoogle-search:update-testing \
+            --platform linux/amd64,linux/arm/v7,linux/arm64 .
       - name: build and push release (version + latest)
         if: github.event_name == 'release' && github.event.release.prerelease == false && (github.actor == 'benbusby' || github.actor == 'Don-Swanson')
         run: |
@@ -88,4 +99,4 @@ jobs:
             --platform linux/amd64,linux/arm/v7,linux/arm64 .
           docker buildx build --push \
             --tag ghcr.io/benbusby/whoogle-search:${GITHUB_REF#refs/*/v}\
-            --platform linux/amd64,linux/arm/v7,linux/arm64 .
\ No newline at end of file
+            --platform linux/amd64,linux/arm/v7,linux/arm64 .

From c008090d83a44a614210cbba601ad05529be4927 Mon Sep 17 00:00:00 2001
From: Don <32144818+Don-Swanson@users.noreply.github.com>
Date: Wed, 26 Nov 2025 15:39:43 -0600
Subject: [PATCH 2/5] Update docker_main.yml

---
 .github/workflows/docker_main.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker_main.yml b/.github/workflows/docker_main.yml
index f369f47..e2e47e9 100644
--- a/.github/workflows/docker_main.yml
+++ b/.github/workflows/docker_main.yml
@@ -3,7 +3,7 @@ name: docker_main
 on:
   workflow_run:
     workflows: ["tests"]
-    branches: [main]
+    branches: [main, updates]
     types:
       - completed
 
@@ -11,6 +11,7 @@ on:
 jobs:
   on-success:
     runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
     - name: checkout code
       uses: actions/checkout@v2

From f9f54115e317d27eb482b1e5d7db11aa6df03d12 Mon Sep 17 00:00:00 2001
From: Don <32144818+Don-Swanson@users.noreply.github.com>
Date: Wed, 26 Nov 2025 15:39:54 -0600
Subject: [PATCH 3/5] Delete .github/workflows/.pre-commit-config.yaml

---
 .github/workflows/.pre-commit-config.yaml | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 .github/workflows/.pre-commit-config.yaml

diff --git a/.github/workflows/.pre-commit-config.yaml b/.github/workflows/.pre-commit-config.yaml
deleted file mode 100644
index 027ab32..0000000
--- a/.github/workflows/.pre-commit-config.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-repos:
-  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.9
-    hooks:
-      - id: ruff
-        args: [--fix]
-      - id: ruff-format
-  - repo: https://github.com/psf/black
-    rev: 24.8.0
-    hooks:
-      - id: black
-        args: [--quiet]

From 9ff2d2f90a380751f7bb043d1d2e832d1a4cd9ba Mon Sep 17 00:00:00 2001
From: Don <32144818+Don-Swanson@users.noreply.github.com>
Date: Wed, 26 Nov 2025 15:58:45 -0600
Subject: [PATCH 4/5] Update buildx.yml

---
 .github/workflows/buildx.yml | 37 ++++++++++--------------------------
 1 file changed, 10 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml
index fc854bc..5cb90ff 100644
--- a/.github/workflows/buildx.yml
+++ b/.github/workflows/buildx.yml
@@ -21,19 +21,18 @@ jobs:
         if: ${{ github.event.workflow_run.conclusion != 'success' && startsWith(github.ref, 'refs/tags') != true }}
         run: exit 1
       - name: checkout code
-        uses: actions/checkout@v2
-      - name: install buildx
-        id: buildx
-        uses: crazy-max/ghaction-docker-buildx@v1
-        with:
-          version: latest
+        uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       - name: Login to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Login to ghcr.io
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -51,14 +50,10 @@ jobs:
       #       --tag ghcr.io/benbusby/whoogle-search:latest \
       #       --platform linux/amd64,linux/arm64 .
       - name: build and push updates branch (update-testing tag)
-        if: github.event.workflow_run.head_branch == 'updates' && github.event.workflow_run.conclusion == 'success' && (github.actor == 'benbusby' || github.actor == 'Don-Swanson')
+        if: github.event_name == 'workflow_run' && github.event.workflow_run.head_branch == 'updates' && github.event.workflow_run.conclusion == 'success' && (github.event.workflow_run.actor.login == 'benbusby' || github.event.workflow_run.actor.login == 'Don-Swanson')
         run: |
-          docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-          docker buildx ls
           docker buildx build --push \
             --tag benbusby/whoogle-search:update-testing \
-            --platform linux/amd64,linux/arm/v7,linux/arm64 .
-          docker buildx build --push \
             --tag ghcr.io/benbusby/whoogle-search:update-testing \
             --platform linux/amd64,linux/arm/v7,linux/arm64 .
       - name: build and push release (version + latest)
@@ -66,13 +61,9 @@ jobs:
         run: |
           TAG="${{ github.event.release.tag_name }}"
           VERSION="${TAG#v}"
-          docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-          docker buildx ls
           docker buildx build --push \
             --tag benbusby/whoogle-search:${VERSION} \
             --tag benbusby/whoogle-search:latest \
-            --platform linux/amd64,linux/arm/v7,linux/arm64 .
-          docker buildx build --push \
             --tag ghcr.io/benbusby/whoogle-search:${VERSION} \
             --tag ghcr.io/benbusby/whoogle-search:latest \
             --platform linux/amd64,linux/arm/v7,linux/arm64 .
@@ -81,22 +72,14 @@ jobs:
         run: |
           TAG="${{ github.event.release.tag_name }}"
           VERSION="${TAG#v}"
-          docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-          docker buildx ls
           docker buildx build --push \
             --tag benbusby/whoogle-search:${VERSION} \
-            --platform linux/amd64,linux/arm/v7,linux/arm64 .
-          docker buildx build --push \
             --tag ghcr.io/benbusby/whoogle-search:${VERSION} \
             --platform linux/amd64,linux/arm/v7,linux/arm64 .
       - name: build and push tag
         if: startsWith(github.ref, 'refs/tags')
         run: |
-          docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-          docker buildx ls
           docker buildx build --push \
-            --tag benbusby/whoogle-search:${GITHUB_REF#refs/*/v}\
-            --platform linux/amd64,linux/arm/v7,linux/arm64 .
-          docker buildx build --push \
-            --tag ghcr.io/benbusby/whoogle-search:${GITHUB_REF#refs/*/v}\
+            --tag benbusby/whoogle-search:${GITHUB_REF#refs/*/v} \
+            --tag ghcr.io/benbusby/whoogle-search:${GITHUB_REF#refs/*/v} \
             --platform linux/amd64,linux/arm/v7,linux/arm64 .

From c96f5ada2e7f12366360579b2961038e80c7f3a2 Mon Sep 17 00:00:00 2001
From: Don <32144818+Don-Swanson@users.noreply.github.com>
Date: Wed, 26 Nov 2025 16:42:39 -0600
Subject: [PATCH 5/5] Update buildx.yml

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

diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml
index 5cb90ff..535a72a 100644
--- a/.github/workflows/buildx.yml
+++ b/.github/workflows/buildx.yml
@@ -55,7 +55,7 @@ jobs:
           docker buildx build --push \
             --tag benbusby/whoogle-search:update-testing \
             --tag ghcr.io/benbusby/whoogle-search:update-testing \
-            --platform linux/amd64,linux/arm/v7,linux/arm64 .
+            --platform linux/amd64,linux/arm64 .
       - name: build and push release (version + latest)
         if: github.event_name == 'release' && github.event.release.prerelease == false && (github.actor == 'benbusby' || github.actor == 'Don-Swanson')
         run: |
@@ -66,7 +66,7 @@ jobs:
             --tag benbusby/whoogle-search:latest \
             --tag ghcr.io/benbusby/whoogle-search:${VERSION} \
             --tag ghcr.io/benbusby/whoogle-search:latest \
-            --platform linux/amd64,linux/arm/v7,linux/arm64 .
+            --platform linux/amd64,linux/arm64 .
       - name: build and push pre-release (version only)
         if: github.event_name == 'release' && github.event.release.prerelease == true && (github.actor == 'benbusby' || github.actor == 'Don-Swanson')
         run: |
@@ -75,11 +75,11 @@ jobs:
           docker buildx build --push \
             --tag benbusby/whoogle-search:${VERSION} \
             --tag ghcr.io/benbusby/whoogle-search:${VERSION} \
-            --platform linux/amd64,linux/arm/v7,linux/arm64 .
+            --platform linux/amd64,linux/arm64 .
       - name: build and push tag
         if: startsWith(github.ref, 'refs/tags')
         run: |
           docker buildx build --push \
             --tag benbusby/whoogle-search:${GITHUB_REF#refs/*/v} \
             --tag ghcr.io/benbusby/whoogle-search:${GITHUB_REF#refs/*/v} \
-            --platform linux/amd64,linux/arm/v7,linux/arm64 .
+            --platform linux/amd64,linux/arm64 .