Skip to content

Don't check for landed landing unless we applied patches #1022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jgraham wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Don't check for landed landing unless we applied patches #1022

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions sync/landing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1128,15 +1128,16 @@ def update_landing(git_gecko, # type: Repo
raise AbortError("Existing landing head commit %s doesn't match"
"supplied wpt head %s" % (landing.wpt_commits.head.sha1,
new_wpt_head))
head = landing.gecko_commits.head.sha1
if git_gecko.is_ancestor(head, env.config["gecko"]["refs"]["central"]):
logger.info("Landing reached central")
with landing.as_mut(lock):
landing.finish()
return None
elif git_gecko.is_ancestor(head, landing.gecko_integration_branch()):
logger.info("Landing is on inbound but not yet on central")
return None
head = landing.gecko_commits.head
if head.is_landing:
if git_gecko.is_ancestor(head.sha1, env.config["gecko"]["refs"]["central"]):
logger.info("Landing reached central")
with landing.as_mut(lock):
landing.finish()
return None
elif git_gecko.is_ancestor(head.sha1, landing.gecko_integration_branch()):
logger.info("Landing is on autoland but not yet on central")
return None

landable = landable_commits(git_gecko,
git_wpt,
Expand Down