Skip to content

Commit 0f6ca9f

Browse files
committed
update docs
1 parent 345f902 commit 0f6ca9f

File tree

3 files changed

+15
-82
lines changed

3 files changed

+15
-82
lines changed

README.md

Lines changed: 1 addition & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -27,77 +27,4 @@ See the [adoption docs](https://jupyter-releaser.readthedocs.io/en/latest/how_to
2727

2828
Detailed workflows are available to draft a changelog, draft a release, publish a release, and check a release.
2929

30-
### Draft ChangeLog Workflow
31-
32-
- Manual Github workflow
33-
- Inputs are the target repo, branch, and the version spec
34-
- Bumps the version
35-
- By default, uses [tbump](https://github.com/tankerhq/tbump) or [bump2version](https://github.com/c4urself/bump2version) to bump the version based on presence of config files
36-
- We recommend `tbump` instead of `bump2version` for most cases because it does not handle patch releases well when using [prereleases](https://github.com/c4urself/bump2version/issues/190).
37-
- Prepares the environment
38-
- Sets up git config and branch
39-
- Generates a changelog (using [github-activity](https://github.com/executablebooks/github-activity)) using the PRs since the last tag on this branch.
40-
- Gets the current version and then does a git checkout to clear state
41-
- Adds a new version entry using a HTML comment markers in the changelog file
42-
- Optionally resolves [meeseeks](https://github.com/MeeseeksBox/MeeseeksDev) backport PRs to their original PR
43-
- Creates a PR with the changelog changes
44-
- Can be re-run using the same version spec. It will add new entries but preserve existing ones (in case they have been hand modified).
45-
- Note: Pre-release changelog sections are not automatically combined,
46-
but you may wish to do so manually.
47-
48-
### Draft Release Workflow
49-
50-
- Manual Github workflow
51-
- Inputs are target repository, branch, version spec and optional post version spec
52-
- Bumps version using the same method as the changelog action
53-
- Prepares the environment using the same method as the changelog action
54-
- Checks the changelog entry
55-
- Looks for the current entry using the HTML comment markers
56-
- Gets the expected changelog values using `github-activity`
57-
- Ensures that all PRs are the same between the two
58-
- For Python packages:
59-
- Builds the wheel and source distributions if applicable
60-
- Makes sure Python dists can be installed and imported in a virtual environment
61-
- For npm package(s) (including workspace support):
62-
- Builds tarball(s) using `npm pack`
63-
- Make sure tarball(s) can be installed and imported in a new npm package
64-
- Checks the package manifest using [`check-manifest`](https://github.com/mgedmin/check-manifest)
65-
- Checks the links in Markdown and reStructuredText files
66-
- Adds a commit that includes the hashes of the dist files
67-
- Creates an annotated version tag in standard format
68-
- If given, bumps the version using the post version spec. The post version
69-
spec can also be given as a setting, see the [Write Releaser Config Guide](https://jupyter-releaser.readthedocs.io/en/latest/how_to_guides/write_config.html).
70-
- Pushes the commits and tag to the target `branch`
71-
- Publishes a draft GitHub release for the tag with the changelog entry as the text
72-
73-
### Publish Release Workflow
74-
75-
- Manual Github workflow
76-
- Input is the url of the draft release
77-
- Downloads the dist assets from the release
78-
- Verifies shas and integrity of release assets
79-
- Publishes assets to appropriate registries
80-
- If the tag is on a backport branch, makes a forwardport PR for the changelog entry
81-
82-
### Check Release Workflow
83-
84-
- Runs on CI in the target repository to verify compatibility and release-ability.
85-
- Runs the `Draft Changelog` and `Draft Release` actions in dry run mode
86-
- Publishes to the local PyPI server and/or dry-run `npm publish`.
87-
- Does not make PRs or push git changes
88-
89-
## FAQs
90-
91-
### My changelog is out of sync
92-
93-
Create a new manual PR to fix the PR and re-orient the changelog entry markers.
94-
95-
### PR is merged to the target branch in the middle of a "Draft Release"
96-
97-
The release will fail to push commits because it will not be up to date. Delete the pushed tags and re-start with "Draft Changelog" to
98-
pick up the new PR.
99-
100-
## How to keep fork of Jupyter Releaser up to date
101-
102-
The manual workflow files target the `@v1` actions in the source repository, which means that as long as
103-
the workflow files themselves are up to date, you will always be running the most up to date actions.
30+
See the [workflow details documentation](https://jupyter-releaser.readthedocs.io/en/latest/background/theory.html#workflow-details) for more information.

docs/source/background/theory.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ Detailed workflows are available to draft a changelog, draft a release, publish
4040
### Draft Release Workflow
4141

4242
- Manual Github workflow
43-
- Inputs are target repository, branch, version spec and optional post version spec
43+
- Input is the URL of the draft GitHub Release created in the Draft Changelog
44+
workflow.
4445
- Bumps version using the same method as the changelog action
4546
- Prepares the environment using the same method as the changelog action
4647
- Checks the changelog entry
@@ -60,17 +61,23 @@ Detailed workflows are available to draft a changelog, draft a release, publish
6061
- If given, bumps the version using the post version spec. he post version
6162
spec can also be given as a setting, [Write Releaser Config Guide](../how_to_guides/write_config.html#automatic-dev-versions).
6263
- Pushes the commits and tag to the target `branch`
63-
- Publishes a draft GitHub release for the tag with the changelog entry as the text
64+
- Updates the draft GitHub release for the tag with the changelog entry as the text
6465

6566
### Publish Release Workflow
6667

6768
- Manual Github workflow
68-
- Input is the url of the draft release
69+
- Input is the url of the draft GitHub release
6970
- Downloads the dist assets from the release
7071
- Verifies shas and integrity of release assets
7172
- Publishes assets to appropriate registries
7273
- If the tag is on a backport branch, makes a forwardport PR for the changelog entry
7374

75+
### Full Release Workflow
76+
77+
- Combines the Draft and Publish workflows into a single workflow.
78+
- If this workflow fails during the publish step, you can address any
79+
credential errors and run the Publish Release Workflow to publish assets.
80+
7481
### Check Release Workflow
7582

7683
- Runs on CI in the target repository to verify compatibility and release-ability.

docs/source/get_started/making_first_release.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ already uses Jupyter Releaser.
3535
## Draft Changelog
3636
3737
- Go to the "Actions" tab in your fork of `jupyter_releaser`
38-
- Select the "Draft Changelog" workflow on the left
38+
- Select the "Step 1: Draft Changelog" workflow on the left
3939
- Click on the "Run workflow" dropdown button on the right
4040
- Fill in the appropriate parameters
4141
@@ -48,6 +48,7 @@ already uses Jupyter Releaser.
4848
instead.
4949
- Use the "since" field to select PRs prior to the latest tag to include in the release
5050
- Type "true" in the "since the last stable git tag" if you would like to include PRs since the last non-prerelease version tagged on the target repository and branch.
51+
- The additional "Post Version Spec" field should be used if your repo uses a dev version (e.g. 0.7.0.dev0)
5152
- The workflow will use the GitHub API to find the relevant pull requests and make an appropriate changelog entry.
5253
- The workflow will create a pull request to the target
5354
repository and branch. It will print the link in the "\*\* Next Step \*\*" job step.
@@ -72,13 +73,11 @@ already uses Jupyter Releaser.
7273
- Click on the "Actions" tab
7374
- Select the "Full Release" workflow on the left
7475
- Click on the "Run workflow" button on the right
75-
- Fill in the entries as prompted by the automated changelog text
76+
- Fill in draft GitHub Release URL given by the Changelog PR.
7677
7778
![Full Release Workflow Dialog](../images/draft_release.png)
7879
79-
- The additional "Post Version Spec" field should be used if your repo uses a dev version (e.g. 0.7.0.dev0)
80-
81-
- The workflow will draft a GitHub release, publish assets to the appropriate registries.
80+
- The workflow will finish the GitHub release and publish assets to the appropriate registries.
8281
- If the workflow is not targeting the default branch, it will also generate a forward-port pull request for the changelog entry to the default branch.
8382
- When the workflow finishes it will print a link to the GitHub release and the forward-port PR (if appropriate) in the "\*\* Next Step \*\*" output.
8483

0 commit comments

Comments
 (0)