From 391a263709ed274e18c36bb7eb2d267d85c34b17 Mon Sep 17 00:00:00 2001
From: Goon <duy@wearetopgroup.com>
Date: Thu, 19 Mar 2026 12:29:22 +0700
Subject: [PATCH] fix(ci): make discord notify resilient to docker failures +
 DRY env vars

- notify-discord uses always() so it fires even if docker jobs fail
- Move GHCR_IMAGE/DOCKERHUB_IMAGE to workflow-level env block
---
 .github/workflows/release.yaml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 65fdd31b..6a260fee 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -8,6 +8,10 @@ permissions:
   contents: write
   packages: write
 
+env:
+  GHCR_IMAGE: ghcr.io/${{ github.repository }}
+  DOCKERHUB_IMAGE: digitop/goclaw
+
 jobs:
   release:
     runs-on: ubuntu-latest
@@ -73,9 +77,6 @@ jobs:
     needs: release
     if: needs.release.outputs.released == 'true'
     runs-on: ubuntu-latest
-    env:
-      GHCR_IMAGE: ghcr.io/${{ github.repository }}
-      DOCKERHUB_IMAGE: digitop/goclaw
     strategy:
       matrix:
         include:
@@ -191,9 +192,6 @@ jobs:
     needs: release
     if: needs.release.outputs.released == 'true'
     runs-on: ubuntu-latest
-    env:
-      GHCR_IMAGE: ghcr.io/${{ github.repository }}
-      DOCKERHUB_IMAGE: digitop/goclaw
     steps:
       - uses: actions/checkout@v4
 
@@ -236,10 +234,10 @@ jobs:
           cache-from: type=gha,scope=web
           cache-to: type=gha,mode=max,scope=web
 
-  # Notify Discord on new release
+  # Notify Discord on new release (runs even if docker jobs fail)
   notify-discord:
     needs: [release, build-binaries, docker-images, docker-web]
-    if: needs.release.outputs.released == 'true'
+    if: always() && needs.release.outputs.released == 'true' && !cancelled()
     runs-on: ubuntu-latest
     steps:
       - name: Send Discord notification