mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Don’t fail tasks if a branch was fast-forward-pushed since the triggering push event
This commit is contained in:
parent
08705345d6
commit
7cf489c1f8
1 changed files with 2 additions and 2 deletions
|
@ -482,7 +482,7 @@ class WindowsGenericWorkerTask(GenericWorkerTask):
|
||||||
git += """
|
git += """
|
||||||
git fetch {depth} %GIT_URL% %GIT_REF%
|
git fetch {depth} %GIT_URL% %GIT_REF%
|
||||||
git reset --hard %GIT_SHA%
|
git reset --hard %GIT_SHA%
|
||||||
""".format(depth="--depth 1" if shallow else "")
|
""".format(depth="--depth 100" if shallow else "")
|
||||||
return self \
|
return self \
|
||||||
.with_git() \
|
.with_git() \
|
||||||
.with_script(git) \
|
.with_script(git) \
|
||||||
|
@ -604,7 +604,7 @@ class UnixTaskMixin(Task):
|
||||||
cd repo
|
cd repo
|
||||||
git fetch {depth} "$GIT_URL" "$GIT_REF"
|
git fetch {depth} "$GIT_URL" "$GIT_REF"
|
||||||
git reset --hard "$GIT_SHA"
|
git reset --hard "$GIT_SHA"
|
||||||
""".format(depth="--depth 1" if shallow else ""))
|
""".format(depth="--depth 100" if shallow else ""))
|
||||||
|
|
||||||
def with_curl_script(self, url, file_path):
|
def with_curl_script(self, url, file_path):
|
||||||
self.curl_scripts_count += 1
|
self.curl_scripts_count += 1
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue