More workflow cleanup (#380)

Author: blink1073

.github/actions/draft-release/action.yml

@@ -7,6 +7,9 @@ inputs:
   target:
     description: "The owner/repo GitHub target"
     required: false
+  branch:
+    description: "The target branch"
+    required: false
   release_url:
     description: "The full url to the GitHub release page"
     required: false
@@ -43,4 +46,5 @@ runs:
         export RH_DRY_RUN=${{ inputs.dry_run }}
         export RH_STEPS_TO_SKIP=${{ inputs.steps_to_skip }}
         export RH_RELEASE_URL=${{ inputs.release_url }}
+        export RH_BRANCH=${{ inputs.branch }}
         python -m jupyter_releaser.actions.draft_release

.github/actions/publish-release/action.yml

@@ -7,6 +7,9 @@ inputs:
   target:
     description: "The owner/repo GitHub target"
     required: false
+  branch:
+    description: "The target branch"
+    required: false
   release_url:
     description: "The full url to the GitHub release page"
     required: false
@@ -45,4 +48,5 @@ runs:
         export RH_DRY_RUN=${{ inputs.dry_run }}
         export RH_RELEASE_URL=${{ inputs.release_url }}
         export RH_STEPS_TO_SKIP=${{ inputs.steps_to_skip }}
+        export RH_BRANCH=${{ inputs.branch }}
         python -m jupyter_releaser.actions.publish_release

.github/workflows/draft-changelog.yml

@@ -21,6 +21,7 @@ on:
       since_last_stable:
         description: "Use PRs with activity since the last stable git tag"
         required: false
+        type: boolean
 jobs:
   draft_changelog:
     runs-on: ubuntu-latest

.github/workflows/draft-release.yml

@@ -5,6 +5,9 @@ on:
       target:
         description: "The owner/repo GitHub target"
         required: false
+      branch:
+        description: "The target branch"
+        required: false
       release_url:
         description: "The URL of the draft GitHub release"
         required: false
@@ -34,6 +37,7 @@ jobs:
           target: ${{ github.event.inputs.target }}
           release_url: ${{ github.event.inputs.release_url }}
           steps_to_skip: ${{ github.event.inputs.steps_to_skip }}
+          branch: ${{ github.event.inputs.branch }}
 
       - name: "** Next Step **"
         run: |

.github/workflows/full-release.yml

@@ -5,6 +5,9 @@ on:
       target:
         description: "The owner/repo GitHub target"
         required: false
+      branch:
+        description: "The target branch"
+        required: false
       release_url:
         description: "The URL of the draft GitHub release"
         required: false
@@ -32,6 +35,7 @@ jobs:
         with:
           token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
           target: ${{ github.event.inputs.target }}
+          branch: ${{ github.event.inputs.branch }}
           release_url: ${{ github.event.inputs.release_url }}
           steps_to_skip: ${{ github.event.inputs.steps_to_skip }}
 

.github/workflows/publish-release.yml

@@ -5,6 +5,9 @@ on:
       target:
         description: "The owner/repo GitHub target"
         required: false
+      branch:
+        description: "The target branch"
+        required: false
       release_url:
         description: "The URL of the draft GitHub release"
         required: false
@@ -34,6 +37,7 @@ jobs:
           target: ${{ github.event.inputs.target }}
           release_url: ${{ github.event.inputs.release_url }}
           steps_to_skip: ${{ github.event.inputs.steps_to_skip }}
+          branch: ${{ github.event.inputs.branch }}
 
       - name: "** Next Step **"
         run: |

jupyter_releaser/actions/draft_changelog.py

@@ -1,12 +1,21 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
+import os
+
 from jupyter_releaser.actions.common import make_group, run_action, setup
-from jupyter_releaser.util import handle_since
+from jupyter_releaser.util import CHECKOUT_NAME, get_default_branch, handle_since
 
 setup()
 
 run_action("jupyter-releaser prep-git")
 
+# Handle the branch.
+if not os.environ.get("RH_BRANCH"):
+    cur_dir = os.getcwd()
+    os.chdir(CHECKOUT_NAME)
+    os.environ["RH_BRANCH"] = get_default_branch() or ""
+    os.chdir(cur_dir)
+
 # Capture the "since" variable in case we add tags before checking changelog
 # Do this before bumping the version.
 with make_group("Handle RH_SINCE"):

jupyter_releaser/changelog.py

@@ -10,6 +10,7 @@
 START_MARKER = "<!-- <START NEW CHANGELOG ENTRY> -->"
 END_MARKER = "<!-- <END NEW CHANGELOG ENTRY> -->"
 PR_PREFIX = "Automated Changelog Entry"
+PRECOMMIT_PREFIX = "[pre-commit.ci] pre-commit autoupdate"
 
 
 def format_pr_entry(target, number, auth=None, dry_run=False):
@@ -133,6 +134,9 @@ def get_version_entry(
     # Remove automated changelog PRs
     entry = [e for e in entry if PR_PREFIX not in e]
 
+    # Remove Pre-Commit PRs
+    entry = [e for e in entry if PRECOMMIT_PREFIX not in e]
+
     entry = "\n".join(entry).strip()
 
     # Remove empty documentation entry if only automated changelogs were there

jupyter_releaser/util.py

@@ -553,15 +553,19 @@ def prepare_environment():
 def handle_since():
     """Capture the "since" argument in case we add tags before checking changelog."""
     if os.environ.get("RH_SINCE"):
+        log(f"Using RH_SINCE from env: {os.environ.get('RH_SINCE')}")
         return
     curr_dir = os.getcwd()
     os.chdir(CHECKOUT_NAME)
-    since_last_stable_env = os.environ.get("RH_SINCE_LAST_STABLE")
-    since_last_stable = since_last_stable_env == "true"
+    since_last_stable_env = os.environ.get("RH_SINCE_LAST_STABLE", "")
+    since_last_stable = since_last_stable_env.lower() == "true"
+    log(f"Since last stable? {since_last_stable}")
     since = get_latest_tag(os.environ.get("RH_BRANCH"), since_last_stable)
     if since:
         log(f"Capturing {since} in RH_SINCE variable")
         os.environ["RH_SINCE"] = since
+    else:
+        log("No last stable found!")
     os.chdir(curr_dir)
     return since