From 74fdf9cd77bbe53bcb642f5d9ea6d9d8bdfe6ef2 Mon Sep 17 00:00:00 2001
From: YC Yen-Ching Tseng <yctseng@amd.com>
Date: Tue, 21 Apr 2026 15:45:26 +0800
Subject: [PATCH] [AMD] CI - Fix the cancelled guard to AMD CI (#23338)

---
 .github/workflows/pr-test-amd.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/pr-test-amd.yml b/.github/workflows/pr-test-amd.yml
index 3c199d7f3..cdf64bded 100644
--- a/.github/workflows/pr-test-amd.yml
+++ b/.github/workflows/pr-test-amd.yml
@@ -167,7 +167,7 @@ jobs:
   sgl-kernel-unit-test-amd:
     needs: [check-changes, call-gate]
     if: |
-      always() &&
+      always() && !cancelled() &&
       (
         (contains(format(',{0},', inputs.target_stage || inputs.target_stage_select), ',sgl-kernel-unit-test-amd,')) ||
         (
@@ -228,7 +228,7 @@ jobs:
   sgl-kernel-unit-test-2-gpu-amd:
     needs: [check-changes, call-gate]
     if: |
-      always() &&
+      always() && !cancelled() &&
       (
         (contains(format(',{0},', inputs.target_stage || inputs.target_stage_select), ',sgl-kernel-unit-test-2-gpu-amd,')) ||
         (
@@ -282,7 +282,7 @@ jobs:
   stage-a-test-1-gpu-small-amd:
     needs: [check-changes, call-gate]
     if: |
-      always() &&
+      always() && !cancelled() &&
       (
         (contains(format(',{0},', inputs.target_stage || inputs.target_stage_select), ',stage-a-test-1-gpu-small-amd,')) ||
         (
@@ -322,7 +322,7 @@ jobs:
   jit-kernel-unit-test-amd:
     needs: [check-changes, call-gate]
     if: |
-      always() &&
+      always() && !cancelled() &&
       (
         (contains(format(',{0},', inputs.target_stage || inputs.target_stage_select), ',jit-kernel-unit-test-amd,')) ||
         (
@@ -586,7 +586,7 @@ jobs:
   multimodal-gen-test-1-gpu-amd:
     needs: [check-changes, call-gate]
     if: |
-      always() &&
+      always() && !cancelled() &&
       (
         (contains(format(',{0},', inputs.target_stage || inputs.target_stage_select), ',multimodal-gen-test-1-gpu-amd,')) ||
         (
@@ -717,7 +717,7 @@ jobs:
   multimodal-gen-test-2-gpu-amd:
     needs: [check-changes, call-gate]
     if: |
-      always() &&
+      always() && !cancelled() &&
       (
         (contains(format(',{0},', inputs.target_stage || inputs.target_stage_select), ',multimodal-gen-test-2-gpu-amd,')) ||
         (