diff options
| author | bors <bors@rust-lang.org> | 2021-08-15 14:02:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-08-15 14:02:40 +0000 |
| commit | c0490a2dbbb94f8244fb6a15ca5d33dc3fcd268a (patch) | |
| tree | d2bddc09eba1cdf3bb64df82d725f969956d8632 /src | |
| parent | 58d685ecb3d4711cf3d21af502ccf51e63ae289c (diff) | |
| parent | c15bc2e38380d570ed8a86253c5208d7fc0f6aea (diff) | |
| download | rust-c0490a2dbbb94f8244fb6a15ca5d33dc3fcd268a.tar.gz rust-c0490a2dbbb94f8244fb6a15ca5d33dc3fcd268a.zip | |
Auto merge of #87792 - GuillaumeGomez:ci-fetch, r=pietroalbini
Remove git fetch from CI https://github.com/rust-lang/rust/pull/86623 added a call to `git fetch`, which is problematic for releases. r? `@pietroalbini`
Diffstat (limited to 'src')
| -rwxr-xr-x | src/ci/docker/run.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index 489c3d76601..e42b4748fdc 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -220,11 +220,13 @@ else fi if [ "$CI" != "" ]; then - # Get some needed information for $BASE_COMMIT - git fetch "https://github.com/$GITHUB_REPOSITORY" "$GITHUB_BASE_REF" - BASE_COMMIT="$(git merge-base FETCH_HEAD HEAD)" + # Get some needed information for $BASE_COMMIT + # + # This command gets the last merge commit which we'll use as base to list + # deleted files since then. + BASE_COMMIT="$(git log --author=bors@rust-lang.org -n 2 --pretty=format:%H | tail -n 1)" else - BASE_COMMIT="" + BASE_COMMIT="" fi docker \ |