Skip to content

ci(librarian): close existing PR and delete branch in update workflow #13689

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

Merged
zhumin8 merged 3 commits into from
Jul 7, 2026
Merged

ci(librarian): close existing PR and delete branch in update workflow #13689

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
035c2b3
ci(librarian): close existing PR and delete branch in update workflow
zhumin8 Jul 7, 2026
5f3638d
let workflow fail if delete branch fails
zhumin8 Jul 7, 2026
99e18dc
update note
zhumin8 Jul 7, 2026
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
23 changes: 16 additions & 7 deletions .github/workflows/update_librarian_googleapis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,32 @@ jobs:
path: google-cloud-java
fetch-depth: 0
persist-credentials: false
- name: Check for Open PR
- name: Close Existing PR and Branch
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
run: |
set -x
current_branch="update-librarian-googleapis-main"

if [ "${{ github.event_name }}" = "pull_request" ]; then
echo "PR Test: Skipping open PR check."
echo "PR Test: Skipping cleanup."
else
# Try to find an open pull request associated with the branch
pr_num=$(gh pr list -s open -H "${current_branch}" -q . --json number | jq ".[] | .number")

if [ -n "${pr_num}" ]; then
echo "Error: An open Pull Request already exists for this update: PR #${pr_num}."
echo "Please merge or close the existing PR before running this workflow again."
exit 1 # Fails this step and the workflow
echo "Closing existing PR #${pr_num}..."
gh pr close "${pr_num}" --delete-branch || gh pr close "${pr_num}"
fi

# Delete the remote branch if it still exists (e.g. if no PR was open)
echo "Checking if remote branch ${current_branch} exists..."
if gh api "repos/${{ github.repository }}/git/refs/heads/${current_branch}" --silent 2>/dev/null; then
echo "Deleting remote branch ${current_branch}..."
gh api -X DELETE "repos/${{ github.repository }}/git/refs/heads/${current_branch}" || {
echo "Error: Failed to delete remote branch ${current_branch}."
exit 1
}
fi
fi
- name: Set up Go
Expand Down Expand Up @@ -130,7 +139,7 @@ jobs:
PR_BODY: |
Updated googleapis commitish in librarian.yaml to https://github.com/googleapis/googleapis/commit/${{ steps.commit.outputs.new_commit }}

💡 **Note:** Please merge or close this PR so that the daily update workflow can continue to run successfully the next day. Alternatively, you can manually trigger the workflow once this PR is merged or closed.
💡 **Note:** If this PR is still open when the daily update workflow runs next, it will be closed and replaced with a new PR containing the latest updates.
run: |
set -x

Expand Down
Loading