Skip to content

Commit 1d51722

Browse files
committed
update
1 parent bccbc51 commit 1d51722

1 file changed

Lines changed: 13 additions & 11 deletions

File tree

.github/actions/is-commit/action.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,12 @@ runs:
6060
6161
if [ "$pr_count" -gt 0 ]; then
6262
echo "Found $pr_count merged PR(s) associated with this commit → skip"
63-
pr_numbers=$(echo "$search_result" | jq -r '.items[].number')
63+
pr_numbers=$(echo "$search_result" | jq -r '.items[].number' | tr '\n' ',')
64+
pr_numbers=${pr_numbers%,} # Remove trailing comma
6465
echo "PR Numbers: $pr_numbers"
65-
# Используем современный способ установки output для GitHub Actions
66-
echo "pr_numbers=$pr_numbers" >> "$GITHUB_OUTPUT"
67-
echo "proceed=false" >> "$GITHUB_OUTPUT"
66+
# Используем переменную GITHUB_OUTPUT для установки выходных данных
67+
echo "pr_numbers=$pr_numbers" >> $GITHUB_OUTPUT
68+
echo "proceed=false" >> $GITHUB_OUTPUT
6869
exit 0
6970
fi
7071
fi
@@ -73,16 +74,17 @@ runs:
7374
count=$(echo "$response" | jq 'length')
7475
if [ "$count" -gt 0 ]; then
7576
echo "Found $count PR(s) — this is a merge/squash → skip"
76-
pr_numbers=$(echo "$response" | jq -r '.[].number')
77+
pr_numbers=$(echo "$response" | jq -r '.[].number' | tr '\n' ',')
78+
pr_numbers=${pr_numbers%,} # Remove trailing comma
7779
echo "PR Numbers: $pr_numbers"
78-
# Используем современный способ установки output для GitHub Actions
79-
echo "pr_numbers=$pr_numbers" >> "$GITHUB_OUTPUT"
80-
echo "proceed=false" >> "$GITHUB_OUTPUT"
80+
# Используем переменную GITHUB_OUTPUT для установки выходных данных
81+
echo "pr_numbers=$pr_numbers" >> $GITHUB_OUTPUT
82+
echo "proceed=false" >> $GITHUB_OUTPUT
8183
else
8284
echo "No PR associated → normal commit"
83-
# Используем современный способ установки output для GitHub Actions
84-
echo "proceed=true" >> "$GITHUB_OUTPUT"
85-
echo "pr_numbers=" >> "$GITHUB_OUTPUT"
85+
# Используем переменную GITHUB_OUTPUT для установки выходных данных
86+
echo "proceed=true" >> $GITHUB_OUTPUT
87+
echo "pr_numbers=" >> $GITHUB_OUTPUT
8688
# Выводим и на экран для отладки
8789
echo "Set proceed=true in output"
8890
fi

0 commit comments

Comments
 (0)