Skip to content

Commit c0490a2

Browse files
committed
Auto merge of rust-lang#87792 - GuillaumeGomez:ci-fetch, r=pietroalbini
Remove git fetch from CI rust-lang#86623 added a call to `git fetch`, which is problematic for releases. r? `@pietroalbini`
2 parents 58d685e + c15bc2e commit c0490a2

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/ci/docker/run.sh

+6-4
Original file line numberDiff line numberDiff line change
@@ -220,11 +220,13 @@ else
220220
fi
221221

222222
if [ "$CI" != "" ]; then
223-
# Get some needed information for $BASE_COMMIT
224-
git fetch "https://github.com/$GITHUB_REPOSITORY" "$GITHUB_BASE_REF"
225-
BASE_COMMIT="$(git merge-base FETCH_HEAD HEAD)"
223+
# Get some needed information for $BASE_COMMIT
224+
#
225+
# This command gets the last merge commit which we'll use as base to list
226+
# deleted files since then.
227+
BASE_COMMIT="$(git log --author=bors@rust-lang.org -n 2 --pretty=format:%H | tail -n 1)"
226228
else
227-
BASE_COMMIT=""
229+
BASE_COMMIT=""
228230
fi
229231

230232
docker \

0 commit comments

Comments
 (0)