From c4ccbbf85305ccbba97d9b4e2bab21b29f889fa2 Mon Sep 17 00:00:00 2001
From: ryuupendragon <ryuu@ryuu.in>
Date: Fri, 4 Jul 2025 14:41:53 +0530
Subject: [PATCH] Merge test

---
 .gitea/workflows/build.yaml |  4 ----
 .gitea/workflows/merge.yaml | 21 +++++++++++----------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index a468560..0e5cf0c 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -2,10 +2,6 @@ name: Docker Build
 
 on:
   workflow_dispatch:
-  push:
-    branches: [ "main" ]
-    paths-ignore:
-      - '**/README.md'
 
 jobs:
   build:
diff --git a/.gitea/workflows/merge.yaml b/.gitea/workflows/merge.yaml
index 4a1b365..c810567 100644
--- a/.gitea/workflows/merge.yaml
+++ b/.gitea/workflows/merge.yaml
@@ -2,23 +2,24 @@ name: Docker Merge
 
 on:
   workflow_dispatch:
-
+  push:
+    branches: [ "main" ]
+    paths-ignore:
+      - '**/README.md'
 
 jobs:
   merge-docker-manifest:
     runs-on: ubuntu-latest
+    needs: build
     steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Create manifest images
-        run: docker manifest create ${{ vars.DOCKERHUB_REPO }}:latest --amend ${{ vars.DOCKERHUB_REPO }}:latest-amd64 --amend ${{ vars.DOCKERHUB_REPO }}:latest-arm64
-
-      - name: Push manifest images
-        run: docker manifest push --purge ${{ vars.DOCKERHUB_REPO }}:latest
+      - name: Create and push manifest images
+        uses: Noelware/docker-manifest-action@master # or use a pinned version in the Releases tab
+        with:
+          inputs: ${{ vars.DOCKERHUB_REPO }}:latest
+          tags: ${{ vars.DOCKERHUB_REPO }}:latest-arm64,${{ vars.DOCKERHUB_REPO }}:latest-amd64         
+        push: true
\ No newline at end of file