Add commit hash to releases
This commit is contained in:
@@ -591,6 +591,7 @@ class PackageRelease(db.Model):
|
||||
url = db.Column(db.String(200), nullable=False)
|
||||
approved = db.Column(db.Boolean, nullable=False, default=False)
|
||||
task_id = db.Column(db.String(37), nullable=True)
|
||||
commit_hash = db.Column(db.String(41), nullable=True, default=None)
|
||||
|
||||
|
||||
def getEditURL(self):
|
||||
|
||||
@@ -344,9 +344,10 @@ def makeVCSReleaseFromGithub(id, branch, release, url):
|
||||
if len(commits) == 0 or not "sha" in commits[0]:
|
||||
raise TaskError("No commits found")
|
||||
|
||||
release.url = urlmaker.getCommitDownload(commits[0]["sha"])
|
||||
release.url = urlmaker.getCommitDownload(commits[0]["sha"])
|
||||
release.task_id = None
|
||||
release.commit_hash = commits[0]["sha"]
|
||||
print(release.url)
|
||||
release.task_id = None
|
||||
db.session.commit()
|
||||
|
||||
return release.url
|
||||
@@ -374,9 +375,10 @@ def makeVCSRelease(id, branch):
|
||||
with open(destPath, "wb") as fp:
|
||||
repo.archive(fp, format="zip")
|
||||
|
||||
release.url = "/uploads/" + filename
|
||||
release.url = "/uploads/" + filename
|
||||
release.task_id = None
|
||||
release.commit_hash = repo.head.object.hexsha
|
||||
print(release.url)
|
||||
release.task_id = None
|
||||
db.session.commit()
|
||||
|
||||
return release.url
|
||||
|
||||
@@ -21,6 +21,10 @@
|
||||
Url: <a href="{{ release.url }}">{{ release.url }}</a><br />
|
||||
{% endif %}
|
||||
|
||||
{% if release.commit_hash %}
|
||||
Commit Hash: {{ release.commit_hash }}<br />
|
||||
{% endif %}
|
||||
|
||||
{% if release.task_id %}
|
||||
Importing... <a href="{ url_for('check_task', id=release.task_id, r=release.getEditURL()) }}">view task</a><br />
|
||||
{% if package.checkPerm(current_user, "CHANGE_RELEASE_URL") %}
|
||||
|
||||
@@ -188,7 +188,8 @@
|
||||
<li>
|
||||
{% if not rel.approved %}<i>{% endif %}
|
||||
|
||||
<a href="{{ rel.url }}">{{ rel.title }}</a>,
|
||||
<a href="{{ rel.url }}">{{ rel.title }}</a>{% if rel.commit_hash %}
|
||||
[{{ rel.commit_hash | truncate(5, end='') }}]{% endif %},
|
||||
created {{ rel.releaseDate | datetime }}.
|
||||
{% if rel.task_id %}
|
||||
<a href="{{ url_for('check_task', id=rel.task_id, r=package.getDetailsURL()) }}">Importing...</a>
|
||||
|
||||
Reference in New Issue
Block a user