Merge pull request #153 from jtpio/simplify-publish

Simpler Solution for Full Publish

Author: Steven Silvester

.github/workflows/autopublish-release.yml

@@ -20,10 +20,6 @@ on:
       since_last_stable:
         description: Use PRs with activity since the last stable git tag
         required: false
-      auto_publish:
-        description: Whether to automatically run the Auto Publish workflow
-        default: true
-        required: false
 jobs:
   release:
     runs-on: ubuntu-latest
@@ -61,28 +57,7 @@ jobs:
           post_version_spec: ${{ github.event.inputs.post_version_spec }}
           since: ${{ github.event.inputs.since }}
           since_last_stable: ${{ github.event.intputs.since_last_stable }}
-
-      - name: "Store Auto Publish URL"
-        run: |
-          if [ ${{ github.events.inputs.auto_publish }} == 'true']; then
-            echo ${{ steps.draft-release.outputs.release_url }} > "draft-release-url.txt"
-          else:
-            echo "Skipping auto publish"
-            echo "" > "draft-release-url.txt"
-          fi
-
-      - name: "Upload Auto Publish URL"
-        uses: actions/upload-artifact@v2
-        with:
-          name: draft-release-url
-          path: |
-            draft-release-url.txt
-
       - name: "** Next Step **"
         run: |
-          if [ ${{ github.events.inputs.auto_publish }} == 'true']; then
-            echo "Wait for the 'Auto Publish workflow to complete';
-          else
-            echo "Run the "Publish Release" Workflow with Release Url:"
-            echo ${{ steps.draft-release.outputs.release_url }}
-          fi
+          echo "Run the "Publish Release" Workflow with Release Url:"
+          echo ${{ steps.draft-release.outputs.release_url }}

.github/workflows/draft-release.yml

@@ -0,0 +1,88 @@
+name: Full Release
+on:
+  workflow_dispatch:
+    inputs:
+      target:
+        description: "The owner/repo GitHub target"
+        required: true
+      branch:
+        description: "The branch to target"
+        required: true
+      version_spec:
+        description: "New Version Specifier"
+        required: true
+      post_version_spec:
+        description: "Post Version Specifier"
+        required: false
+      since:
+        description: Use PRs with activity since this date or git reference
+        required: false
+      since_last_stable:
+        description: Use PRs with activity since the last stable git tag
+        required: false
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        python-version: ["3.9"]
+    env:
+      VERSION_SPEC: ${{ github.event.inputs.version_spec }}
+      POST_VERSION_SPEC: ${{ github.event.inputs.post_version_spec }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Install Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+          architecture: "x64"
+      - name: Install node
+        uses: actions/setup-node@v2
+        with:
+          node-version: "14.x"
+      - name: Upgrade packaging dependencies
+        run: |
+          pip install --upgrade pip setuptools wheel --user
+
+      - name: Create Draft GitHub Release
+        id: draft-release
+        uses: jupyter-server/jupyter_releaser/.github/actions/draft-release@v1
+        with:
+          token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
+          target: ${{ github.event.inputs.target }}
+          branch: ${{ github.event.inputs.branch }}
+          version_spec: ${{ github.event.inputs.version_spec }}
+          post_version_spec: ${{ github.event.inputs.post_version_spec }}
+          since: ${{ github.event.inputs.since }}
+          since_last_stable: ${{ github.event.intputs.since_last_stable }}
+
+      - name: Publish Release
+        id: publish-release
+        env:
+          PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
+          PYPI_TOKEN_MAP: ${{ secrets.PYPI_TOKEN_MAP }}
+          TWINE_USERNAME: __token__
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        uses: jupyter-server/jupyter_releaser/.github/actions/publish-release@v1
+        with:
+          token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
+          release_url: ${{ steps.draft-release.outputs.release_url }}
+
+      - name: "** Next Step **"
+        if: ${{ success() }}
+        run: |
+          echo "Verify the final release"
+          echo ${{ steps.publish-release.outputs.release_url }}
+          if [ ! -z "${{ steps.publish-release.outputs.pr_url }}" ]; then
+             echo "Merge the forwardport PR"
+             echo ${{ steps.publish-release.outputs.pr_url }}
+          fi
+
+      - name: "** Failure Message **"
+        if: ${{ failure() }}
+        run: |
+          echo "Failed to Publish the Draft Release Url:"
+          echo ${{ steps.draft-release.outputs.release_url }}

.github/workflows/full-release.yml

@@ -118,7 +118,7 @@ def draft_changelog(
     if npm_versions:
         body += npm_versions
 
-    body += '\n\nAfter merging this PR run the "Draft Release" Workflow on your fork of `jupyter_releaser` with the following inputs'
+    body += '\n\nAfter merging this PR run the "Full Release" Workflow on your fork of `jupyter_releaser` with the following inputs'
     body += f"""
 | Input  | Value |
 | ------------- | ------------- |