Clean up workflows (#379)

jupyter-server · Sep 13, 2022 · e8dd7b6 · e8dd7b6
1 parent a30d0d2
commit e8dd7b6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/.github/actions/draft-changelog/action.yml b/.github/actions/draft-changelog/action.yml
@@ -4,19 +4,19 @@ inputs:
   token:
     description: "GitHub access token"
     required: true
+  target:
+    description: "The owner/repo GitHub target"
+    required: true
   version_spec:
     description: "New Version Specifier"
     default: "next"
     required: false
-  post_version_spec:
-    description: "Post Version Specifier"
-    required: false
-  target:
-    description: "The owner/repo GitHub target"
-    required: true
   branch:
     description: "The branch to target"
     required: false
+  post_version_spec:
+    description: "Post Version Specifier"
+    required: false
   dry_run:
     description: "If set, do not make a PR"
     default: "false"
@@ -33,7 +33,7 @@ outputs:
     value: ${{ steps.draft-changelog.outputs.pr_url }}
   release_url:
     description: "The html URL of the draft GitHub release"
-    value: ${{ steps.draft-release.outputs.release_url }}
+    value: ${{ steps.draft-changelog.outputs.release_url }}
 runs:
   using: "composite"
   steps:

diff --git a/.github/workflows/draft-changelog.yml b/.github/workflows/draft-changelog.yml
@@ -2,18 +2,19 @@ name: "Step 1: Draft Changelog"
 on:
   workflow_dispatch:
     inputs:
-      version_spec:
-        description: "New Version Specifier"
-        required: true
-      post_version_spec:
-        description: "Post Version Specifier"
-        required: false
       target:
         description: "The owner/repo GitHub target"
         required: true
+      version_spec:
+        description: "New Version Specifier"
+        default: "next"
+        required: false
       branch:
         description: "The branch to target"
         required: false
+      post_version_spec:
+        description: "Post Version Specifier"
+        required: false
       since:
         description: "Use PRs with activity since this date or git reference"
         required: false

diff --git a/jupyter_releaser/lib.py b/jupyter_releaser/lib.py
@@ -318,7 +318,8 @@ def draft_release(
         gh.upload_file(release, fpath)
 
     # Set the body of the release with the changelog contents.
-    gh.repos.update_release(
+    # Get the new release since the draft release might change urls.
+    release = gh.repos.update_release(
         release.id,
         release.tag_name,
         release.target_commitish,