Skip to content

Fix unbound variable in upstream-sync.sh when SKIP_PRS is empty #709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jzding wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −11
Open

Fix unbound variable in upstream-sync.sh when SKIP_PRS is empty #709

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions hack/upstream-sync.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,9 +278,13 @@ should_skip_pr() {
filter_skipped() {
log "Filtering PRs for skip conditions..."

local skip_pr_list skip_commit_list
IFS=',' read -ra skip_pr_list <<< "${SKIP_PRS:-}"
IFS=',' read -ra skip_commit_list <<< "${SKIP_COMMITS:-}"
local skip_pr_list=() skip_commit_list=()
if [[ -n "${SKIP_PRS:-}" ]]; then
IFS=',' read -ra skip_pr_list <<< "$SKIP_PRS"
fi
if [[ -n "${SKIP_COMMITS:-}" ]]; then
IFS=',' read -ra skip_commit_list <<< "$SKIP_COMMITS"
fi
Comment thread
coderabbitai[bot] marked this conversation as resolved.

local kept_prs="[]"
local skipped_prs="[]"
Expand All @@ -295,15 +299,17 @@ filter_skipped() {

local skip_reason=""

for skip_num in "${skip_pr_list[@]}"; do
skip_num="${skip_num// /}"
if [ -n "$skip_num" ] && [ "$skip_num" = "$pr_number" ]; then
skip_reason="manually skipped (SKIP_PRS)"
break
fi
done
if [[ ${#skip_pr_list[@]} -gt 0 ]]; then
for skip_num in "${skip_pr_list[@]}"; do
skip_num="${skip_num// /}"
if [ -n "$skip_num" ] && [ "$skip_num" = "$pr_number" ]; then
skip_reason="manually skipped (SKIP_PRS)"
break
fi
done
fi

if [ -z "$skip_reason" ]; then
if [ -z "$skip_reason" ] && [[ ${#skip_commit_list[@]} -gt 0 ]]; then
for skip_sha in "${skip_commit_list[@]}"; do
skip_sha="${skip_sha// /}"
if [ -n "$skip_sha" ] && [[ "$pr_sha" == ${skip_sha}* ]]; then
Expand Down