Skip to content
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

Jump to bottom

Fix github build status reporting bug #5985

Merged
merged 7 commits into from
Jul 31, 2019
Merged

Fix github build status reporting bug #5985

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d028222
fix github build status bug
saadmk11 Jul 24, 2019
49716a7
commit sha passed to build status reporting task
saadmk11 Jul 24, 2019
af20054
added commit to builder
saadmk11 Jul 25, 2019
cc607b9
pass commit everywhere
saadmk11 Jul 26, 2019
4f57544
paas commit while creating build object
saadmk11 Jul 26, 2019
478ed9e
Merge branch 'master' into build-status-bug-fix
ericholscher Jul 31, 2019
8c70f2a
pass local variable identifier to checkout
saadmk11 Jul 31, 2019
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
38 changes: 17 additions & 21 deletions readthedocs/projects/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,27 +130,23 @@ def sync_repo(self):
)

# Get the actual code on disk
try:
before_vcs.send(sender=self.version)
msg = 'Checking out version {slug}: {identifier}'.format(
slug=self.version.slug,
identifier=self.version.identifier,
)
log.info(
LOG_TEMPLATE,
{
'project': self.project.slug,
'version': self.version.slug,
'msg': msg,
}
)
version_repo = self.get_vcs_repo()
version_repo.update()
self.sync_versions(version_repo)
identifier = self.commit or self.version.identifier
version_repo.checkout(identifier)
finally:
after_vcs.send(sender=self.version)
msg = 'Checking out version {slug}: {identifier}'.format(
slug=self.version.slug,
identifier=self.version.identifier,
)
log.info(
LOG_TEMPLATE,
{
'project': self.project.slug,
'version': self.version.slug,
'msg': msg,
}
)
version_repo = self.get_vcs_repo()
version_repo.update()
self.sync_versions(version_repo)
identifier = self.commit or self.version.identifier
version_repo.checkout(self.version.identifier)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should pass this here. identifier from the line above. might have changes while resolving conflict :)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yea, that was a failure in the conflict resolution on my side.


def sync_versions(self, version_repo):
"""
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.