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] 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 .