Prevent merge conflicts when running customer tests. (#86063)

This commit is contained in:
Ian Hickson 2021-07-08 15:11:05 -07:00 committed by GitHub
parent 711f9b7c43
commit 456fe1abed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -154,7 +154,6 @@ task:
# otherwise we won't be able to figure out how old or new our current branch is.
- git config user.email "cirrus-bot@invalid"
- git fetch origin master:master
- git rebase master
# The actual logic is in a shell script so that it can be shared between CIs.
- (cd dev/customer_testing/; ./ci.sh)