From d1018eb677c27c91a09a5b13fd68929fe80af595 Mon Sep 17 00:00:00 2001
From: David J Eddy <david@appwrite.io>
Date: Fri, 13 Mar 2026 13:04:23 +0100
Subject: [PATCH 1/2] FIX GitHub action triggering for building image

---
 .github/workflows/build-and-push.yml |  6 +++---
 CHANGES.md                           | 11 +++++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index b682ac9..5e3f889 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -43,7 +43,7 @@ jobs:
           docker image push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}-${{matrix.arch}}
 
   manifest_build_and_push_on_feature:
-    if: github.ref != 'refs/heads/main'
+    if: github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/tags/')
     needs: build_and_push
     runs-on: ubuntu-24.04
     steps:
@@ -64,8 +64,8 @@ jobs:
         run: |
             docker manifest push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
 
-  manifest_build_and_push_on_main:
-    if: github.ref == 'refs/heads/main'
+  manifest_build_and_push_on_tag:
+    if: startsWith(github.ref, 'refs/tags/')
     needs: build_and_push
     runs-on: ubuntu-24.04
     steps:
diff --git a/CHANGES.md b/CHANGES.md
index b2c4c28..cd657fc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## Version 1.1.1
+
+### Fix
+
+* .github/workflows/build-and-push.yml manifest_build_and_push_on_feature no longer wrongs on tag creation
+* .github/workflows/build-and-push.yml manifest_build_and_push_on_tag now correctly builds on tag creation
+
 ## Version 1.1.0
 
 ### Add
@@ -26,13 +33,13 @@
 * PHP version bumped to 8.5
 * Refactored multi-arch build process to prevent cross-arch builds requiring long wait times
 
-### Fixes
+### Fix
 
 * README.md usage instructions more detailed
 
 ### Miscellaneous
 
-### Removed
+### Remove
 
 * Build tools from final stage of Dockerfile
 * GitHub action to Setup QEMU as GitHub now provides native ARM runners

From 1c81c7fac57b088e29566317f2a2b245cd2ff26a Mon Sep 17 00:00:00 2001
From: David J Eddy <david@appwrite.io>
Date: Fri, 13 Mar 2026 13:22:11 +0100
Subject: [PATCH 2/2] Feedback corrections

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index cd657fc..b29211f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,7 +4,7 @@
 
 ### Fix
 
-* .github/workflows/build-and-push.yml manifest_build_and_push_on_feature no longer wrongs on tag creation
+* .github/workflows/build-and-push.yml manifest_build_and_push_on_feature no longer triggers on tag creation
 * .github/workflows/build-and-push.yml manifest_build_and_push_on_tag now correctly builds on tag creation
 
 ## Version 1.1.0