Skip to content

Commit 2d9fc9f

Browse files
committed
cleanup
1 parent e5b6d4f commit 2d9fc9f

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

jupyter_releaser/actions/draft_release.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
setup()
1414

15+
if not os.environ.get("RH_RELEASE_URL"):
16+
raise RuntimeError("Cannot complete Draft Release, no draft GitHub release url found!")
17+
1518
changelog_location = None
1619
changelog_text = ""
1720

jupyter_releaser/util.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,10 @@ def latest_draft_release(gh, branch=None):
341341
"""Get the latest draft release for a given repo"""
342342
newest_time = None
343343
newest_release = None
344+
if branch:
345+
log(f"Getting latest draft release on branch {branch}")
346+
else:
347+
log("Getting latest draft release")
344348
for release in gh.repos.list_releases():
345349
if str(release.draft).lower() == "false":
346350
continue
@@ -351,6 +355,10 @@ def latest_draft_release(gh, branch=None):
351355
if newest_time is None or d_created > newest_time:
352356
newest_time = d_created
353357
newest_release = release
358+
if not newest_release:
359+
log("No draft release found!")
360+
else:
361+
log(f"Found draft release at {newest_release.html_url}")
354362
return newest_release
355363

356364

@@ -511,8 +519,9 @@ def prepare_environment():
511519

512520
# Set up GitHub object.
513521
branch = os.environ.get("RH_BRANCH")
514-
owner, repo_name = os.environ["GITHUB_REPOSITORY"].split("/")
522+
owner, repo_name = os.environ["RH_REPOSITORY"].split("/")
515523
auth = os.environ.get("GITHUB_ACCESS_TOKEN", "")
524+
log(f"Getting GitHub connection for {owner}/{repo_name}")
516525
gh = get_gh_object(dry_run=dry_run, owner=owner, repo=repo_name, token=auth)
517526

518527
# Get the latest draft release if none is given.
@@ -528,6 +537,7 @@ def prepare_environment():
528537

529538
# Extract the metadata from the release url.
530539
return extract_metadata_from_release_url(gh, release_url, auth)
540+
return release_url
531541

532542

533543
def handle_since():

0 commit comments

Comments
 (0)