Merge pull request #13 from jupyter-server/force-check

More Cleanup

Author: blink1073

.github/workflows/check-release.yml

@@ -16,6 +16,10 @@ jobs:
         with:
           python-version: 3.9
           architecture: "x64"
+      - name: Install node
+        uses: actions/setup-node@v2
+        with:
+          node-version: "14.x"
       - name: Get pip cache dir
         id: pip-cache
         run: |

.github/workflows/draft-changelog.yml

@@ -26,12 +26,16 @@ jobs:
         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: Draft Changelog
         id: draft-changelog
-        uses: jupyter-server/jupyter_server/.github/actions/draft-changelog@v1
+        uses: jupyter-server/jupyter_releaser/.github/actions/draft-changelog@v1
         with:
           token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
           version_spec: ${{ github.event.inputs.version_spec }}

.github/workflows/draft-release.yml

@@ -32,12 +32,16 @@ jobs:
         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/release_helper/.github/actions/draft-release@v1
+        uses: jupyter-server/jupyter_releaser/.github/actions/draft-release@v1
         with:
           token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
           target: ${{ github.event.inputs.target }}

.github/workflows/publish-release.yml

@@ -20,6 +20,10 @@ jobs:
         with:
           python-version: 3.9
           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

jupyter_releaser/lib.py

@@ -459,7 +459,7 @@ def prep_git(ref, branch, repo, auth, username, url, install=True):
     ref = ref or ""
 
     # Make sure we have *all* tags
-    util.run("git fetch origin --tags")
+    util.run("git fetch origin --tags --force")
 
     # Handle the ref
     if ref.startswith("refs/pull/"):
@@ -566,7 +566,7 @@ def forwardport_changelog(
     body = title
 
     pr = make_changelog_pr(
-        auth, ref, branch, repo, title, commit_message, body, dry_run=dry_run
+        auth, branch, repo, title, commit_message, body, dry_run=dry_run
     )
 
     # Clean up after ourselves

jupyter_releaser/tests/test_cli.py

@@ -79,7 +79,7 @@ def test_prep_git_full(py_package, tmp_path, mocker, runner):
             call('git config --global user.name "GitHub Action"'),
             call("git init .jupyter_releaser_checkout"),
             call("git remote add origin https://snuffy:[email protected]/baz/bar.git"),
-            call("git fetch origin --tags"),
+            call("git fetch origin --tags --force"),
             call("git fetch origin +refs/pull/42:refs/pull/42"),
             call("git fetch origin refs/pull/42"),
             call("git checkout -B foo refs/pull/42"),