From 267fee3414a7c1db2361c88666503f0ec57294e7 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Wed, 3 Dec 2025 20:10:50 +0100
Subject: [PATCH] Revert "chore: retry 'Docker build and push' on failure"

This reverts commit 91f4b7697020ef51887934ae72527d2d4adb2e7b.
---
 .github/workflows/ci.yml | 44 ++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 346498a91..77a8cf806 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -91,19 +91,17 @@ jobs:
 
             - name: dev - Docker build and push
               if: github.ref == 'refs/heads/dev' && github.event_name == 'push'
-              uses: Wandalen/wretry.action@master
+              uses: docker/build-push-action@v6
               with:
-                  action: docker/build-push-action@v6
-                  with: |
-                      context: .
-                      file: docker/Dockerfile
-                      platforms: linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/riscv64,linux/386
-                      tags: koenkk/zigbee2mqtt:latest-dev,ghcr.io/koenkk/zigbee2mqtt:latest-dev
-                      push: true
-                      build-args: |
-                          COMMIT=${{ github.sha }}
-                          VERSION=dev
-                          DATE=${{ github.event.repository.updated_at }}
+                  context: .
+                  file: docker/Dockerfile
+                  platforms: linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/riscv64,linux/386
+                  tags: koenkk/zigbee2mqtt:latest-dev,ghcr.io/koenkk/zigbee2mqtt:latest-dev
+                  push: true
+                  build-args: |
+                      COMMIT=${{ github.sha }}
+                      VERSION=dev
+                      DATE=${{ github.event.repository.updated_at }}
 
             - name: dev - Publish types
               if: github.ref == 'refs/heads/dev' && github.event_name == 'push'
@@ -141,19 +139,17 @@ jobs:
 
             - name: release - Docker build and push
               if: startsWith(github.ref, 'refs/tags/') && github.event_name == 'push'
-              uses: Wandalen/wretry.action@master
+              uses: docker/build-push-action@v6
               with:
-                  action: docker/build-push-action@v6
-                  with: |
-                      context: .
-                      file: docker/Dockerfile
-                      platforms: linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/riscv64,linux/386
-                      tags: ${{ steps.meta.outputs.tags }}
-                      push: true
-                      build-args: |
-                          COMMIT=${{ github.sha }}
-                          VERSION=${{ github.ref_name }}
-                          DATE=${{ github.event.repository.updated_at }}
+                  context: .
+                  file: docker/Dockerfile
+                  platforms: linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/riscv64,linux/386
+                  tags: ${{ steps.meta.outputs.tags }}
+                  push: true
+                  build-args: |
+                      COMMIT=${{ github.sha }}
+                      VERSION=${{ github.ref_name }}
+                      DATE=${{ github.event.repository.updated_at }}
 
             - name: 'release: Publish to npm'
               if: startsWith(github.ref, 'refs/tags/') && github.event_name == 'push'