mirror of
https://github.com/servo/servo.git
synced 2025-08-03 20:50:07 +01:00
Include UpdateCheckout in SyncToUpstreamRunner.
This is necessary to support syncing from a clean tree.
This commit is contained in:
parent
26b40afe23
commit
070d3ffa54
1 changed files with 3 additions and 2 deletions
|
@ -4,7 +4,7 @@ import subprocess
|
||||||
import sys
|
import sys
|
||||||
import urlparse
|
import urlparse
|
||||||
|
|
||||||
from wptrunner.update.sync import LoadManifest
|
from wptrunner.update.sync import LoadManifest, UpdateCheckout
|
||||||
from wptrunner.update.tree import get_unique_name
|
from wptrunner.update.tree import get_unique_name
|
||||||
from wptrunner.update.base import Step, StepRunner, exit_clean, exit_unclean
|
from wptrunner.update.base import Step, StepRunner, exit_clean, exit_unclean
|
||||||
|
|
||||||
|
@ -364,7 +364,8 @@ class PRDeleteBranch(Step):
|
||||||
|
|
||||||
class SyncToUpstreamRunner(StepRunner):
|
class SyncToUpstreamRunner(StepRunner):
|
||||||
"""Runner for syncing local changes to upstream"""
|
"""Runner for syncing local changes to upstream"""
|
||||||
steps = [LoadManifest,
|
steps = [UpdateCheckout,
|
||||||
|
LoadManifest,
|
||||||
CheckoutBranch,
|
CheckoutBranch,
|
||||||
GetLastSyncCommit,
|
GetLastSyncCommit,
|
||||||
GetBaseCommit,
|
GetBaseCommit,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue