From 446d1350db016e9a86d29aea8473af943d5b51a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9E=D0=BB=D0=B5=D0=B3?=
 <150132506+iddqdex@users.noreply.github.com>
Date: Mon, 10 Nov 2025 21:13:19 +0300
Subject: [PATCH 1/2] Fix graph path on retry

---
 .github/actions/test_ya/action.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/actions/test_ya/action.yml b/.github/actions/test_ya/action.yml
index 1d21b17781c2..5b6c061ac8c4 100644
--- a/.github/actions/test_ya/action.yml
+++ b/.github/actions/test_ya/action.yml
@@ -278,10 +278,6 @@ runs:
           fi
 
           git checkout $ORIGINAL_HEAD
-          params+=(
-            --build-custom-json=$GRAPH_PATH
-            --custom-context=$CONTEXT_PATH
-          )
           YA_MAKE_TARGET="ydb"
         else
           YA_MAKE_TARGET=""
@@ -393,8 +389,14 @@ runs:
           monitor_memory &
           MONITOR_PID=$!
 
+          if [ -z "$GRAPH_PATH" ]; then
+            GRAPH_OPTS="--build-custom-json=$GRAPH_PATH --custom-context=$CONTEXT_PATH"
+          else
+            GRAPH_OPTS=""
+          fi
+
           set +e
-          (./ya make ${params[@]} ${CACHE_OPTS[@]} $YA_MAKE_TARGET \
+          (./ya make ${params[@]} ${CACHE_OPTS[@]} $YA_MAKE_TARGET $GRAPH_OPTS \
             $RERUN_FAILED_OPT --log-file "$PUBLIC_DIR/ya_log.txt"  \
             --evlog-file "$CURRENT_PUBLIC_DIR/ya_evlog.jsonl" \
             --junit "$CURRENT_JUNIT_XML_PATH" --build-results-report "$CURRENT_REPORT" --output "$YA_MAKE_OUT_DIR"; echo $? > exit_code) |& cat >> $YA_MAKE_OUTPUT

From 93ef35ecbde3d0db2211159a858feb8e6ff43ea2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9E=D0=BB=D0=B5=D0=B3?=
 <150132506+iddqdex@users.noreply.github.com>
Date: Mon, 10 Nov 2025 21:48:38 +0300
Subject: [PATCH 2/2] Update action.yml

---
 .github/actions/test_ya/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/test_ya/action.yml b/.github/actions/test_ya/action.yml
index 5b6c061ac8c4..9cdec71342ef 100644
--- a/.github/actions/test_ya/action.yml
+++ b/.github/actions/test_ya/action.yml
@@ -389,7 +389,7 @@ runs:
           monitor_memory &
           MONITOR_PID=$!
 
-          if [ -z "$GRAPH_PATH" ]; then
+          if [ -n "$GRAPH_PATH" ]; then
             GRAPH_OPTS="--build-custom-json=$GRAPH_PATH --custom-context=$CONTEXT_PATH"
           else
             GRAPH_OPTS=""