Skip to content

Commit 1b8b6b2

Browse files
committed
Fully unshallow every as ls-remote also fails
1 parent 49f82a1 commit 1b8b6b2

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

.github/workflows/update-from-template.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,9 @@ jobs:
209209
echo "Checking if PR can be auto-merged. Try: $i"
210210
211211
echo "Checking if update-branch-merged exists"
212-
git fetch
213-
if [[ $(git ls-remote --exit-code --heads origin ${{ env.UPDATE_BRANCH_MERGED }}) ]]; then
212+
git fetch --unshallow && git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" || true
213+
git fetch origin
214+
if [[ $(git rev-parse origin/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then
214215
echo "Branch origin/${{ env.UPDATE_BRANCH_MERGED }} is missing"
215216
exit 0
216217
fi
@@ -272,8 +273,7 @@ jobs:
272273
echo "Base branch is $base_branch"
273274
274275
echo "Fully fetching..."
275-
git fetch --unshallow || true
276-
git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
276+
git fetch --unshallow && git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" || true
277277
git fetch origin
278278
279279
if [[ $(git rev-parse origin/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then

0 commit comments

Comments
 (0)