Skip to content

Commit a76852a

Browse files
authored
Fixup and hedgedoc (#8792)
1 parent a79b8f2 commit a76852a

File tree

1 file changed

+25
-28
lines changed

1 file changed

+25
-28
lines changed

package/README.md

+25-28
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Here is a rough overview of the effective release process. See the section below
7373

7474
* Since most changes are integrated into master using squash-rebase policy (i.e. one commit per PR), `git log --oneline` gives a good overview of changes in the release.
7575

76-
* Prepare release notes in Markdown format.
76+
* Prepare release notes in Markdown format. Either use the `git log --oneline` output and sort through it manually, or use Github draft release and press 'Generate release notes' (see https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes)
7777

7878
* For changes that are breaking, duplicate those changes and put the duplicate lines into a separate group called Breaking Changes. That group should go at the top of the Changelog. The original lines for the breaking changes should be marked by appending "(Breaking change)" to the line. Example:
7979

@@ -99,11 +99,11 @@ Here is a rough overview of the effective release process. See the section below
9999
- Documentation
100100
- Boards
101101
102-
* Not all commit descriptions which come from `git log` will explain changes well. Reword items as necessary, with the goal that a general user of this project should be able to understand what the change is related to. Preserve references to PRs or issues (`#XXXX`).
102+
* Not all commit descriptions which come from `git log` or PR titles will explain changes well. Reword items as necessary, with the goal that a general user of this project should be able to understand what the change is related to. Preserve references to PRs or issues (`#XXXX`).
103103
104104
* Aggregate minor fixes (e.g. typos, small documentation changes) in a few items. Focus on preparing a good overview of the release for the users, rather than mentioning every change.
105105
106-
* When done, put release notes into a private [Gist](https://gist.github.com) or [firepad](https://demo.firepad.io) and send the link to other maintainers for review.
106+
* When done, put release notes into a private [Gist](https://gist.github.com) or [HedgeDoc note](https://hedgedoc.org/) and send the link to other maintainers for review.
107107
108108
The following points assume work in a direct clone of the repository, and not in a personal fork.
109109
@@ -141,13 +141,13 @@ The following points assume work in a direct clone of the repository, and not in
141141
142142
8. Check that the new (draft) release has been created (no editing at this point!), see https://github.com/esp8266/Arduino/releases.
143143
144-
9. Check that the boards manager package .zip file has been successfully uploaded as a release artifact.
144+
9. Check that the boards manager package .zip file has been successfully uploaded as a release asset.
145145
146146
10. Check that the package index downloaded from https://arduino.esp8266.com/stable/package_esp8266com_index.json contains an entry for the new version (it may not be the first one).
147147
148148
11. Navigate to release list in Github here https://github.com/esp8266/Arduino/releases, press "Edit" button to edit release description, paste release notes, and publish it.
149149
150-
12. In the issue tracker, remove "staged-for-release" label for all issues which have it, and close them. Close the milestone associated with the released version (the milestone should be empty per point 2 above)
150+
12. Close the milestone associated with the released version (the milestone should be empty per point 1 above)
151151
152152
13. Check that https://arduino-esp8266.readthedocs.io/en/latest/ has a new doc build for the new tag, and that "stable" points to that build. If a new build did not trigger, log into readthedoc's home here https://readthedocs.org/ (account must have been added to project as maintainer) and trigger it manually.
153153
@@ -186,13 +186,13 @@ The following points assume work in a direct clone of the repository, and not in
186186

187187
- [ ] 8. Check that the new (draft) release has been created (no editing at this point!), see https://github.com/esp8266/Arduino/releases.
188188

189-
- [ ] 9. Check that the boards manager package .zip file has been successfully uploaded as a release artifact.
189+
- [ ] 9. Check that the boards manager package .zip file has been successfully uploaded as a release asset.
190190

191191
- [ ] 10. Check that the package index downloaded from https://arduino.esp8266.com/stable/package_esp8266com_index.json contains an entry for the new version (it may not be the first one).
192192

193193
- [ ] 11. Navigate to [release list in Github](https://github.com/esp8266/Arduino/releases), press "Edit" button to edit release description, paste release notes, and publish it.
194194

195-
- [ ] 12. In the issue tracker, remove "staged-for-release" label for all issues which have it, and close them. Close the milestone associated with the released version (the milestone should be empty per point 1 above)
195+
- [ ] 12. Close the milestone associated with the released version (the milestone should be empty per point 1 above)
196196

197197
- [ ] 13. Check that https://arduino-esp8266.readthedocs.io/en/latest/ has a new doc build for the new tag, and that "stable" points to that build. If a new build did not trigger, log into readthedoc's home here https://readthedocs.org/ (account must have been added to project as maintainer) and trigger it manually.
198198

@@ -207,33 +207,30 @@ The following points assume work in a direct clone of the repository, and not in
207207
208208
A SSH private/public key pair is required to update the master JSON (the final step of the release process). Sometimes GitHub will expire one side or the other of that key, and a new one will need to be regenerated and installed in the https://github.com/esp8266/esp8266.github.io (JSON) and https://github.com/esp8266/Arduino (core) repos.
209209
210-
1. Generate a new public/private SSH key pair:
211-
````
212-
$ ssh-keygen -t ed25519 -C [email protected] (**replace with your GH user account email**)
213-
Generating public/private ed25519 key pair.
214-
Enter file in which to save the key (/home/earle/.ssh/id_ed25519): deploy_key
215-
Enter passphrase (empty for no passphrase): (**use no passphrase**)
216-
Enter same passphrase again:
217-
Your identification has been saved in deploy_key
218-
Your public key has been saved in deploy_key.pub
219-
The key fingerprint is:
220-
...
221-
````
210+
1. Generate a new public/private SSH key pair with an empty passphrase:
211+
```console
212+
$ ssh-keygen -f deploy_key -t ed25519 -N '' -C [email protected] (**replace with your GH user account email**)
213+
Generating public/private ed25519 key pair.
214+
Your identification has been saved in deploy_key
215+
Your public key has been saved in deploy_key.pub
216+
The key fingerprint is:
217+
...
218+
```
222219

223220
2. Copy the contents of `deploy_key.pub` to the clipboard:
224-
````
221+
```console
225222
$ cat deploy_key.pub
226-
ssh-ed25519 AAA..... [email protected]
227-
````
223+
ssh-ed25519 AAA..... [email protected]
224+
```
228225

229-
3. Install the deploy key to GH.io. Go to https://github.com/esp8266/esp8266.github.io and the `Settings->Deploy Keys` and `Add deploy key`. Paste the (public key) string into the box and select `Allow writes` and hit OK.
226+
3. Install the deploy key for esp8266.github.io repository. Go to https://github.com/esp8266/esp8266.github.io and the `Settings->Deploy Keys` and `Add deploy key`. Paste the (public key) string into the box and select `Allow writes` and hit OK.
230227

231228
4. Convert the `deploy_key` private key to a 1-line base64 representation and copy it to the clipboard.
232-
````
229+
```console
233230
$ base64 -w 0 < deploy_key && echo ""
234-
yEvYm..... (**note this must be one single long line, hence the "-w 0"**)
235-
````
231+
yEvYm..... (**note this must be one single long line, hence the "-w 0"**)
232+
```
236233

237-
5. Install the private key to the core repo. Go to https://github.com/esp8266/Arduino and select `Settings->Secrets->Actions` and add or update a `Repository secret` called `GHCI_DEPLOY_KEY`. Paste the 1-line base64 contents of your clipboard to the box and hit OK.
234+
5. Install the private key to the Core repo. Go to https://github.com/esp8266/Arduino and select `Settings->Secrets->Actions` and add or update a `Repository secret` called `GHCI_DEPLOY_KEY`. Paste the 1-line base64 contents of your clipboard to the box and hit OK.
238235

239-
6. If the release failed in the `Update master JSON file` action, from the GH web interface run the `Actions->Release XXX->Re-run failed jobs` to re-run it and check its output.
236+
6. If the release failed in the `Update master JSON file` action, from the GitHub web interface run the `Actions->Release XXX->Re-run failed jobs` to re-run it and check its output.

0 commit comments

Comments
 (0)