Skip to content

Commit 1695394

Browse files
blink1073blink1073
authored
[1.x] Switch to releaser v2 and update workflows (#1052)
1 parent da7071a commit 1695394

File tree

5 files changed

+116
-28
lines changed

5 files changed

+116
-28
lines changed

‎.github/workflows/check-release.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ on:
77
jobs:
88
check_release:
99
runs-on: ubuntu-latest
10-
strategy:
11-
matrix:
12-
group: [check_release, link_check]
1310
steps:
1411
- name: Checkout
1512
uses: actions/checkout@v2
@@ -19,11 +16,7 @@ jobs:
1916
run: |
2017
pip install -e .
2118
- name: Check Release
22-
if: ${{ matrix.group == 'check_release' }}
23-
uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v1
19+
uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v2
2420
with:
2521
version_spec: 100.100.100
2622
token: ${{ secrets.GITHUB_TOKEN }}
27-
- name: Run Link Check
28-
if: ${{ matrix.group == 'link_check' }}
29-
uses: jupyter-server/jupyter_releaser/.github/actions/check-links@v1

‎.github/workflows/prep-release.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: "Step 1: Prep Release"
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
version_spec:
6+
description: "New Version Specifier"
7+
default: "next"
8+
required: false
9+
branch:
10+
description: "The branch to target"
11+
required: false
12+
default: "1.x"
13+
post_version_spec:
14+
description: "Post Version Specifier"
15+
required: false
16+
since:
17+
description: "Use PRs with activity since this date or git reference"
18+
required: false
19+
since_last_stable:
20+
description: "Use PRs with activity since the last stable git tag"
21+
required: false
22+
type: boolean
23+
jobs:
24+
prep_release:
25+
runs-on: ubuntu-latest
26+
steps:
27+
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
28+
29+
- name: Prep Release
30+
id: prep-release
31+
uses: jupyter-server/jupyter_releaser/.github/actions/prep-release@v2
32+
with:
33+
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
34+
version_spec: ${{ github.event.inputs.version_spec }}
35+
post_version_spec: ${{ github.event.inputs.post_version_spec }}
36+
target: ${{ github.event.inputs.target }}
37+
branch: ${{ github.event.inputs.branch }}
38+
since: ${{ github.event.inputs.since }}
39+
since_last_stable: ${{ github.event.inputs.since_last_stable }}
40+
41+
- name: "** Next Step **"
42+
run: |
43+
echo "Optional): Review Draft Release: ${{ steps.prep-release.outputs.release_url }}"

‎.github/workflows/publish-release.yml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: "Step 2: Publish Release"
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
branch:
6+
description: "The target branch"
7+
required: false
8+
default: "1.x"
9+
release_url:
10+
description: "The URL of the draft GitHub release"
11+
required: false
12+
steps_to_skip:
13+
description: "Comma separated list of steps to skip"
14+
required: false
15+
16+
jobs:
17+
publish_release:
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
21+
22+
- name: Populate Release
23+
id: populate-release
24+
uses: jupyter-server/jupyter_releaser/.github/actions/populate-release@v2
25+
with:
26+
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
27+
target: ${{ github.event.inputs.target }}
28+
branch: ${{ github.event.inputs.branch }}
29+
release_url: ${{ github.event.inputs.release_url }}
30+
steps_to_skip: ${{ github.event.inputs.steps_to_skip }}
31+
32+
- name: Finalize Release
33+
id: finalize-release
34+
env:
35+
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
36+
PYPI_TOKEN_MAP: ${{ secrets.PYPI_TOKEN_MAP }}
37+
TWINE_USERNAME: __token__
38+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
39+
uses: jupyter-server/jupyter-releaser/.github/actions/finalize-release@v2
40+
with:
41+
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
42+
target: ${{ github.event.inputs.target }}
43+
release_url: ${{ steps.populate-release.outputs.release_url }}
44+
45+
- name: "** Next Step **"
46+
if: ${{ success() }}
47+
run: |
48+
echo "Verify the final release"
49+
echo ${{ steps.finalize-release.outputs.release_url }}
50+
51+
- name: "** Failure Message **"
52+
if: ${{ failure() }}
53+
run: |
54+
echo "Failed to Publish the Draft Release Url:"
55+
echo ${{ steps.populate-release.outputs.release_url }}

‎.github/workflows/python-tests.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
os: [ubuntu-latest, windows-latest, macos-latest]
17-
python-version: ["3.7", "3.10"]
17+
python-version: ["3.7", "3.11"]
1818
include:
1919
- os: windows-latest
2020
python-version: "3.9"
2121
- os: ubuntu-latest
22-
python-version: "pypy-3.7"
22+
python-version: "pypy-3.8"
2323
- os: macos-latest
2424
python-version: "3.8"
25+
- os: ubuntu-latest
26+
python-version: "3.11"
2527
steps:
2628
- name: Checkout
2729
uses: actions/checkout@v2
@@ -48,20 +50,8 @@ jobs:
4850
runs-on: ubuntu-latest
4951
steps:
5052
- uses: actions/checkout@v2
51-
- uses: actions/setup-python@v2
52-
- uses: pre-commit/[email protected]
53-
with:
54-
extra_args: --all-files --hook-stage=manual
55-
- name: Help message if pre-commit fail
56-
if: ${{ failure() }}
57-
run: |
58-
echo "You can install pre-commit hooks to automatically run formatting"
59-
echo "on each commit with:"
60-
echo " pre-commit install"
61-
echo "or you can run by hand on staged files with"
62-
echo " pre-commit run"
63-
echo "or after-the-fact on already committed files with"
64-
echo " pre-commit run --all-files --hook-stage=manual"
53+
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
54+
- uses: jupyterlab/maintainer-tools/.github/actions/pre-commit@v1
6555

6656
test_docs_and_examples:
6757
name: Test Docs and Examples
@@ -120,6 +110,15 @@ jobs:
120110
run: |
121111
pytest -vv -W default || pytest -vv -W default --lf
122112
113+
check_links:
114+
name: Make SDist
115+
runs-on: ubuntu-latest
116+
timeout-minutes: 10
117+
steps:
118+
- uses: actions/checkout@v2
119+
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
120+
- uses: jupyterlab/maintainer-tools/.github/actions/check-links@v1
121+
123122
make_sdist:
124123
name: Make SDist
125124
runs-on: ubuntu-latest
@@ -146,7 +145,8 @@ jobs:
146145
- build
147146
- pre-commit
148147
- test_prereleases
149-
- make_sdist
148+
- test_docs_and_examples
149+
- test_minimum_versions
150150
- test_sdist
151151
runs-on: ubuntu-latest
152152
steps:

‎README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
# Jupyter Server
22

3-
[![Build Status](https://github.com/jupyter/jupyter_server/workflows/CI/badge.svg?query=branch%3A1.x++)](https://github.com/jupyter-server/jupyter_server/actions?query=branch%3A1.x++)
4-
[![Documentation Status](https://readthedocs.org/projects/jupyter-server/badge/?version=stable)](http://jupyter-server.readthedocs.io/en/latest/?badge=stable)
5-
63
The Jupyter Server provides the backend (i.e. the core services, APIs, and REST endpoints) for Jupyter web applications like Jupyter notebook, JupyterLab, and Voila.
74

85
For more information, read our [documentation here](http://jupyter-server.readthedocs.io/en/stable/?badge=latest).

0 commit comments

Comments
 (0)