Merge v2 into main (#415)

* create v2 branch

* Remove check links and check manifest (#395)

* Clean up Extract Release (#396)

* Simplified Workflow (#397)

* Install the version2 branch in common action (#400)

* Clean up asset sha handling (#401)

* Fix handling of asset_shas check (#402)

* Fix twine repository handling (#404)

* Fix handling of changelog entry (#405)

* Fix default twine registry (#408)

* Fix default twine registry again (#410)

* Run mdformat on the manually formatted changelog entry (#413)

* Update docs for simplified workflow (#414)

Author: blink1073

.github/actions/check-links/action.yml

@@ -20,32 +20,32 @@ runs:
         # Install Jupyter Releaser from git unless we are testing Releaser itself
         if ! command -v jupyter-releaser &> /dev/null
         then
-            pip install -q git+https://github.com/jupyter-server/jupyter_releaser.git@v1
+            pip install -q git+https://github.com/jupyter-server/jupyter_releaser.git@version2
         fi
 
-    - id: draft-changelog
+    - id: prep-release
       shell: bash -eux {0}
       run: |
-        export RH_IS_CHECK_RELEASE="true"
+        export RH_DRY_RUN="true"
         export GITHUB_ACCESS_TOKEN=${{ inputs.token }}
         export RH_VERSION_SPEC=${{ inputs.version_spec }}
         export RH_STEPS_TO_SKIP=${{ inputs.steps_to_skip }}
-        python -m jupyter_releaser.actions.draft_changelog
+        python -m jupyter_releaser.actions.prep_release
 
-    - id: draft-release
+    - id: populate-release
       shell: bash -eux {0}
       run: |
-        export RH_IS_CHECK_RELEASE="true"
+        export RH_DRY_RUN="true"
         export GITHUB_ACCESS_TOKEN=${{ inputs.token }}
-        export RH_RELEASE_URL=${{ steps.draft-changelog.outputs.release_url }}
+        export RH_RELEASE_URL=${{ steps.prep-release.outputs.release_url }}
         export RH_STEPS_TO_SKIP=${{ inputs.steps_to_skip }}
-        python -m jupyter_releaser.actions.draft_release
+        python -m jupyter_releaser.actions.populate_release
 
-    - id: publish-release
+    - id: finalize-release
       shell: bash -eux {0}
       run: |
-        export RH_IS_CHECK_RELEASE="true"
+        export RH_DRY_RUN="true"
         export GITHUB_ACCESS_TOKEN=${{ inputs.token }}
-        export RH_RELEASE_URL=${{ steps.draft-changelog.outputs.release_url }}
+        export RH_RELEASE_URL=${{ steps.populate-release.outputs.release_url }}
         export RH_STEPS_TO_SKIP=${{ inputs.steps_to_skip }}
-        python -m jupyter_releaser.actions.publish_release
+        python -m jupyter_releaser.actions.finalize_release

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

@@ -1,4 +1,4 @@
-name: "Publish Release"
+name: "Finalize Release"
 description: "Publish assets and finalize GitHub release"
 inputs:
   token:
@@ -24,10 +24,10 @@ inputs:
 outputs:
   release_url:
     description: "The html URL of the GitHub release"
-    value: ${{ steps.publish-release.outputs.release_url }}
+    value: ${{ steps.finalize-release.outputs.release_url }}
   pr_url:
     description: "The html URL of the forwardport PR if applicable"
-    value: ${{ steps.publish-release.outputs.pr_url }}
+    value: ${{ steps.finalize-release.outputs.pr_url }}
 
 runs:
   using: "composite"
@@ -40,7 +40,7 @@ runs:
         then
             pip install -q git+https://github.com/jupyter-server/jupyter_releaser.git@v1
         fi
-    - id: publish-release
+    - id: finalize-release
       shell: bash -eux {0}
       run: |
         export GITHUB_ACCESS_TOKEN=${{ inputs.token }}
@@ -49,4 +49,4 @@ runs:
         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
+        python -m jupyter_releaser.actions.finalize_release

.github/actions/publish-release/action.yml renamed to .github/actions/finalize-release/action.yml

@@ -10,5 +10,5 @@ runs:
         # Install Jupyter Releaser from git unless we are testing Releaser itself
         if ! command -v jupyter-releaser &> /dev/null
         then
-            pip install -q git+https://github.com/jupyter-server/jupyter_releaser.git@v1
+            pip install -q git+https://github.com/jupyter-server/jupyter_releaser.git@version2
         fi

.github/actions/install-releaser/action.yml

@@ -1,5 +1,5 @@
-name: "Draft Release"
-description: "Create a draft GitHub Release"
+name: "Populate Release"
+description: "Populate the Draft GitHub Release"
 inputs:
   token:
     description: "GitHub access token"
@@ -24,7 +24,7 @@ inputs:
 outputs:
   release_url:
     description: "The html URL of the draft GitHub release"
-    value: ${{ steps.draft-release.outputs.release_url }}
+    value: ${{ steps.populate-release.outputs.release_url }}
 
 runs:
   using: "composite"
@@ -35,10 +35,10 @@ runs:
         # Install Jupyter Releaser from git unless we are testing Releaser itself
         if ! command -v jupyter-releaser &> /dev/null
         then
-            pip install -q git+https://github.com/jupyter-server/jupyter_releaser.git@v1
+            pip install -q git+https://github.com/jupyter-server/jupyter_releaser.git@version2
         fi
 
-    - id: draft-release
+    - id: populate-release
       shell: bash -eux {0}
       run: |
         export GITHUB_ACCESS_TOKEN=${{ inputs.token }}
@@ -47,4 +47,4 @@ runs:
         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
+        python -m jupyter_releaser.actions.populate_release

.github/actions/draft-release/action.yml renamed to .github/actions/populate-release/action.yml

@@ -1,5 +1,5 @@
-name: "Draft Changelog"
-description: "Create an automated changelog entry PR"
+name: "Prep Release"
+description: "Start the Release Process"
 inputs:
   token:
     description: "GitHub access token"
@@ -28,12 +28,9 @@ inputs:
     description: "Use PRs with activity since the last stable git tag"
     required: false
 outputs:
-  pr_url:
-    description: "The URL of the Changelog Pull Request"
-    value: ${{ steps.draft-changelog.outputs.pr_url }}
   release_url:
     description: "The html URL of the draft GitHub release"
-    value: ${{ steps.draft-changelog.outputs.release_url }}
+    value: ${{ steps.prep-release.outputs.release_url }}
 runs:
   using: "composite"
   steps:
@@ -43,10 +40,10 @@ runs:
         # Install Jupyter Releaser from git unless we are testing Releaser itself
         if ! command -v jupyter-releaser &> /dev/null
         then
-            pip install -q git+https://github.com/jupyter-server/jupyter_releaser.git@v1
+            pip install -q git+https://github.com/jupyter-server/jupyter_releaser.git@version2
         fi
 
-    - id: draft-changelog
+    - id: prep-release
       shell: bash -eux {0}
       run: |
         export GITHUB_ACCESS_TOKEN=${{ inputs.token }}
@@ -60,4 +57,4 @@ runs:
         export RH_SINCE=${{ inputs.since }}
         export RH_SINCE_LAST_STABLE=${{ inputs.since_last_stable }}
 
-        python -m jupyter_releaser.actions.draft_changelog
+        python -m jupyter_releaser.actions.prep_release

.github/actions/draft-changelog/action.yml renamed to .github/actions/prep-release/action.yml

@@ -2,6 +2,6 @@ set -eux
 
 # Update the v1 tag for GitHub Actions consumers
 if [[ ${RH_DRY_RUN:=true} != 'true' ]]; then
-    git tag -f -a v1 -m "Github Action release"
+    git tag -f -a v2 -m "Github Action release"
     git push origin -f --tags
 fi

.github/scripts/bump_tag.sh

@@ -1,4 +1,4 @@
-name: "Step 1: Draft Changelog"
+name: "Step 1: Prep Release"
 on:
   workflow_dispatch:
     inputs:
@@ -23,7 +23,7 @@ on:
         required: false
         type: boolean
 jobs:
-  draft_changelog:
+  prep_release:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
@@ -34,11 +34,11 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup
-        uses: ./.github/actions/common
+        uses: jupyter-releaser/.github/actions/common@version2
 
-      - name: Draft Changelog
-        id: draft-changelog
-        uses: ./.github/actions/draft-changelog
+      - name: Prep Release
+        id: prep-release
+        uses: jupyter-releaser/.github/actions/prep-release@version2
         with:
           token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
           version_spec: ${{ github.event.inputs.version_spec }}
@@ -50,8 +50,7 @@ jobs:
 
       - name: "** Next Step **"
         run: |
-          echo "Review PR: ${{ steps.draft-changelog.outputs.pr_url }}"
-          echo "Optional): Review Draft Release: ${{ steps.draft-changelog.outputs.release_url }}"
+          echo "Optional): Review Draft Release: ${{ steps.prep-release.outputs.release_url }}"
           echo "## Next Step" >> $GITHUB_STEP_SUMMARY
-          echo "Review PR: ${{ steps.draft-changelog.outputs.pr_url }}" >> $GITHUB_STEP_SUMMARY
-          echo "(Optional): Review Draft Release: ${{ steps.draft-changelog.outputs.release_url }}" >> $GITHUB_STEP_SUMMARY
+          echo "(Optional): Review Draft Release: ${{ steps.prep-release.outputs.release_url }}" >> $GITHUB_STEP_SUMMARY
+          echo "Run Step 2: Publish Release workflow"