@@ -73,18 +73,21 @@ runs:
7373 # Process normal response
7474 count=$(echo "$response" | jq 'length')
7575 if [ "$count" -gt 0 ]; then
76- echo "Found $count PR(s) — this is a merge/squash → skip"
77- pr_numbers=$(echo "$response" | jq -r '.[].number' | tr '\n' ',')
78- pr_numbers=${pr_numbers%,} # Remove trailing comma
79- echo "PR Numbers: $pr_numbers"
80- # Используем переменную GITHUB_OUTPUT для установки выходных данных
81- echo "pr_numbers=$pr_numbers" >> $GITHUB_OUTPUT
82- echo "proceed=false" >> $GITHUB_OUTPUT
76+ merged_count=$(echo "$response" | jq '[.[] | select(.merged_at != null)] | length')
77+
78+ if [ "$merged_count" -gt 0 ]; then
79+ echo "Found $merged_count merged PR(s) — this is a merge/squash → skip"
80+ pr_numbers=$(echo "$response" | jq -r '[.[] | select(.merged_at != null) | .number] | join(",")')
81+ echo "PR Numbers : $pr_numbers"
82+ echo "pr_numbers=$pr_numbers" >> $GITHUB_OUTPUT
83+ echo "proceed=false" >> $GITHUB_OUTPUT
84+ else
85+ echo "Only open/unmerged PRs found — normal commit"
86+ echo "proceed=true" >> $GITHUB_OUTPUT
87+ echo "pr_numbers=" >> $GITHUB_OUTPUT
88+ fi
8389 else
8490 echo "No PR associated → normal commit"
85- # Используем переменную GITHUB_OUTPUT для установки выходных данных
8691 echo "proceed=true" >> $GITHUB_OUTPUT
8792 echo "pr_numbers=" >> $GITHUB_OUTPUT
88- # Выводим и на экран для отладки
89- echo "Set proceed=true in output"
9093 fi
0 commit comments