Skip to content

Commit 1f49fd8

Browse files
authored
ci: fix weblate branch name and restrict merge to known authors (#122)
1 parent 0fb133f commit 1f49fd8

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

.github/workflows/merge-release-prs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
for repo in "${REPOS[@]}"; do
7878
echo "Processing: $repo"
7979
80-
PR_NUMBER=$(gh pr list --repo "$repo" --head "$BRANCH" --json number --jq '.[0].number // empty' 2>/dev/null)
80+
PR_NUMBER=$(gh pr list --repo "$repo" --head "$BRANCH" --search "author:fossifybot[bot]" --json number --jq '.[0].number // empty' 2>/dev/null)
8181
if [[ -z "$PR_NUMBER" ]]; then
8282
echo "[$repo]: No open PR found for branch $BRANCH. Skipping."
8383
continue

.github/workflows/merge-weblate-prs.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,13 @@ jobs:
101101
continue
102102
fi
103103
104-
HEAD_REF="weblate:${BRANCH}"
105-
PR_NUMBER=$(gh pr list --repo "$repo" --head "$HEAD_REF" --json number --jq '.[0].number // empty' 2>/dev/null)
104+
PR_NUMBER=$(gh pr list --repo "$repo" --head "$BRANCH" --search "author:weblate" --json number --jq '.[0].number // empty' 2>/dev/null)
106105
if [[ -z "$PR_NUMBER" ]]; then
107-
echo "[$repo]: No open PR found for head $HEAD_REF. Skipping."
106+
echo "[$repo]: No open PR found for head $BRANCH. Skipping."
108107
continue
109108
fi
110109
111-
echo "[$repo]: Found PR #$PR_NUMBER for head $HEAD_REF"
112-
110+
echo "[$repo]: Found PR #$PR_NUMBER for head $BRANCH"
113111
if gh pr review --repo "$repo" --approve "$PR_NUMBER" 2>/dev/null; then
114112
echo "[$repo]: PR #$PR_NUMBER approved"
115113
else

0 commit comments

Comments
 (0)