Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-05-29 05:10:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

ci(blocked_prs): use compact jq output when outputting to ENV or step

Browse Source 
ouput

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
Rachel Powers 2025-03-12 15:50:43 -07:00
parent 0bbf529afb
commit eb11cde0f4
No known key found for this signature in database
GPG Key ID: E10E321EB160949B
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/blocked_prs.yml vendored
View File

@ -35,7 +35,7 @@ jobs:
echo "REPO=$(jq -r '.base.repo.name' <<< "$PR_JSON")" echo "REPO=$(jq -r '.base.repo.name' <<< "$PR_JSON")"
echo "OWNER=$(jq -r '.base.repo.owner.login' <<< "$PR_JSON")" echo "OWNER=$(jq -r '.base.repo.owner.login' <<< "$PR_JSON")"
echo "PR_NUMBER=$(jq -r '.number' <<< "$PR_JSON")" echo "PR_NUMBER=$(jq -r '.number' <<< "$PR_JSON")"
echo "JOB_DATA=\"$(jq ' echo "JOB_DATA=$(jq -c '
{ {
"repo": .base.repo.name, "repo": .base.repo.name,
"owner": .base.repo.owner.login, "owner": .base.repo.owner.login,
@ -46,7 +46,7 @@ jobs:
"prBody": .body, "prBody": .body,
"prLabels": (reduce .labels[].name as $l ([]; . + [$l])) "prLabels": (reduce .labels[].name as $l ([]; . + [$l]))
} }
' <<< "$PR_JSON")\"" ' <<< "$PR_JSON")"
} >> "$GITHUB_ENV" } >> "$GITHUB_ENV"
cat $GITHUB_ENV cat $GITHUB_ENV
@ -72,7 +72,7 @@ jobs:
echo "REPO=$(jq -r '.base.repo.name' <<< "$PR_JSON")" echo "REPO=$(jq -r '.base.repo.name' <<< "$PR_JSON")"
echo "OWNER=$(jq -r '.base.repo.owner.login' <<< "$PR_JSON")" echo "OWNER=$(jq -r '.base.repo.owner.login' <<< "$PR_JSON")"
echo "PR_NUMBER=$(jq -r '.number' <<< "$PR_JSON")" echo "PR_NUMBER=$(jq -r '.number' <<< "$PR_JSON")"
echo "JOB_DATA=\"$(jq ' echo "JOB_DATA=$(jq -c '
{ {
"repo": .base.repo.name, "repo": .base.repo.name,
"owner": .base.repo.owner.login, "owner": .base.repo.owner.login,
@ -83,7 +83,7 @@ jobs:
"prBody": .body, "prBody": .body,
"prLabels": (reduce .labels[].name as $l ([]; . + [$l])) "prLabels": (reduce .labels[].name as $l ([]; . + [$l]))
} }
' <<< "$PR_JSON")\"" ' <<< "$PR_JSON")"
} >> "$GITHUB_ENV" } >> "$GITHUB_ENV"
cat $GITHUB_ENV cat $GITHUB_ENV
@ -92,7 +92,7 @@ jobs:
id: pr_ids id: pr_ids
run: | run: |
PRS=$( PRS=$(
jq ' jq -c '
.prBody as $body .prBody as $body
| ( | (
$body | $body |
@ -135,7 +135,7 @@ jobs:
-H "Accept: application/vnd.github+json" \ -H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2022-11-28" \ -H "X-GitHub-Api-Version: 2022-11-28" \
"/repos/$OWNER/$REPO/pulls/$(jq -r '.number' <<< "$pr_data")" \ "/repos/$OWNER/$REPO/pulls/$(jq -r '.number' <<< "$pr_data")" \
| jq --arg type "$(jq -r '.type' <<< "$pr_data")" \ | jq -c --arg type "$(jq -r '.type' <<< "$pr_data")" \
' '
. | { . | {
"type": $type, "type": $type,
@ -150,7 +150,7 @@ jobs:
"baseRefName": .head.ref, "baseRefName": .head.ref,
} }
' '
done < <(jq -c '.blocking[]' <<< "${{steps.pr_ids.outputs.prs}}") | jq -s done < <(jq -c '.blocking[]' <<< "${{steps.pr_ids.outputs.prs}}") | jq -c -s
) )
echo "state=$BLOCKED_PR_DATA" >> "$GITHUB_OUTPUT" echo "state=$BLOCKED_PR_DATA" >> "$GITHUB_OUTPUT"
echo "all_merged=$(jq 'all(.[].merged; .)' <<< "$BLOCKED_PR_DATA")" echo "all_merged=$(jq 'all(.[].merged; .)' <<< "$BLOCKED_PR_DATA")"
@ -241,7 +241,7 @@ jobs:
base_repo_owner=$(jq -r '.baseRepoOwner' <<< "$pr_data") base_repo_owner=$(jq -r '.baseRepoOwner' <<< "$pr_data")
base_repo_name=$(jq -r '.baseRepoName' <<< "$pr_data") base_repo_name=$(jq -r '.baseRepoName' <<< "$pr_data")
compare_url="https://github.com/$base_repo_owner/$base_repo_name/compare/$base_ref_name...$pr_head_label" compare_url="https://github.com/$base_repo_owner/$base_repo_name/compare/$base_ref_name...$pr_head_label"
status=$(jq 'if .merged then ":heavy_check_mark: Merged" else ":x: Not Merged" end' <<< "$pr_data") status=$(jq -r 'if .merged then ":heavy_check_mark: Merged" else ":x: Not Merged" end' <<< "$pr_data")
type=$(jq -r '.type' <<< "$pr_data") type=$(jq -r '.type' <<< "$pr_data")
echo " - $type #$base_pr $status [(compare)]($compare_url)" >> "$COMMENT_PATH" echo " - $type #$base_pr $status [(compare)]($compare_url)" >> "$COMMENT_PATH"
done < <(jq -c '.[]' <<< "${{steps.blocked_data.outputs.state}}") done < <(jq -c '.[]' <<< "${{steps.blocked_data.outputs.state}}")

2
.github/workflows/merge_blocking_pr.yml vendored
View File

@ -51,7 +51,7 @@ jobs:
' \ ' \
--paginate \ --paginate \
--slurp \ --slurp \
| jq --argjson pr "${{ github.event.pull_request.number }}" ' | jq -c --argjson pr "${{ github.event.pull_request.number }}" '
[.[].data.repository.pullRequests.nodes[]] | .[] | select( [.[].data.repository.pullRequests.nodes[]] | .[] | select(
.bodyText | .bodyText |
scan("(?:blocked (?:by|on)|stacked on):? #(?<num>[0-9]+)") | scan("(?:blocked (?:by|on)|stacked on):? #(?<num>[0-9]+)") |