Skip to content

Commit

Permalink
Auto merge of rust-lang#87792 - GuillaumeGomez:ci-fetch, r=pietroalbini
Browse files Browse the repository at this point in the history
Remove git fetch from CI

rust-lang#86623 added a call to `git fetch`, which is problematic for releases.

r? `@pietroalbini`
  • Loading branch information
bors committed Aug 15, 2021
2 parents 58d685e + c15bc2e commit c0490a2
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/ci/docker/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit c0490a2

Please sign in to comment.