Skip to content

Commit 64c6547

Browse files
committed
website: updates
1 parent 6b01ddb commit 64c6547

File tree

3 files changed

+91
-50
lines changed

3 files changed

+91
-50
lines changed

website/docs/developer/index.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,14 +185,14 @@ xpm/xPack actions and build configurations are supported in Visual Studio via th
185185
With this extension installed, xpm/xPack actions can be very conveniently
186186
invoked via a single mouse click, for example:
187187

188-
![xPack actions](https://github.com/xpack/vscode-xpack-extension-ts/raw/master/assets/docs-images/xpack-actions.png)
188+
![xpm actions](https://github.com/xpack/vscode-xpack-extension-ts/raw/master/assets/docs-images/xpack-actions.png)
189189

190190
</details>
191191

192192
## Prerequisites
193193

194194
The build scripts run on GNU/Linux and macOS. The Windows binaries are
195-
compiled on x64 GNU/Linux, using [mingw-w64](https://mingw-w64.org).
195+
compiled on GNU/Linux, using [mingw-w64](https://mingw-w64.org).
196196

197197
For details on installing the prerequisites, please read the
198198
[Build Prerequisites](https://xpack-dev-tools.github.io/docs/developer/install/prerequisites/)

website/docs/maintainer/index.mdx

Lines changed: 68 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -219,13 +219,6 @@ and fix them; assign them to a milestone (like <code>{customField('xpackVersion'
219219

220220
### Update `CHANGELOG.md`
221221

222-
- open the `CHANGELOG.md` file
223-
- check if all previous fixed issues are in
224-
- check the latest commits `xpm run git-log`; if necessary, copy/paste lines,
225-
group by dates and edit them using the below regular expressions
226-
- add a new entry like _**\* v{customField('xpackVersion')} prepared**_
227-
- commit with a message like _**prepare v{customField('xpackVersion')}**_
228-
229222
To turn the dates into headings, change from:
230223

231224
```txt
@@ -256,6 +249,14 @@ to:
256249
*
257250
```
258251

252+
- open the `CHANGELOG.md` file
253+
- check if all previous fixed issues are in
254+
- check the latest commits `xpm run git-log`; if necessary, copy/paste lines,
255+
group by dates and edit them using the below regular expressions
256+
- add a new entry like _**\* v{customField('xpackVersion')} prepared**_
257+
- commit with the message _**prepare v{customField('xpackVersion')}**_
258+
259+
259260
### Push the changes to the `xpack-development` branch
260261

261262
Be sure that the latest commit that updates `VERSION` is pushed
@@ -419,7 +420,7 @@ via HomeBrew, and make a link to `/usr/local/bin`.
419420

420421
:::
421422

422-
- commit with _**website: update folder hierarchies**_.
423+
Commit with the message _**website: update folder hierarchies**_.
423424

424425
### Update the list of links in top package.json
425426

@@ -428,14 +429,14 @@ sequence, for each platform (GNU/Linux, macOS),
428429
and check the
429430
differences compared to the repository.
430431

431-
Commit if necessary with _**package.json: update executables links**_
432+
Commit if necessary with the message _**package.json: update executables links**_.
432433

433434
### Update the durations of the development builds
434435

435436
In `website/docs/maintainer/_development-durations.mdx`, update
436437
the durations of the builds.
437438

438-
Commit if necessary with _**website: update development durations**_
439+
Commit with the message _**website: update development durations**_.
439440

440441
### How to build a debug version
441442

@@ -526,7 +527,7 @@ to `"@xpack-dev-tools/xbb-helper":`
526527

527528
### Commit the changes to `build-assets/package.json`
528529

529-
Use the message **build-assets/package.json: bump deps**.
530+
Commit with the message _**build-assets/package.json: bump deps**_.
530531

531532
### Check for disk space
532533

@@ -573,7 +574,7 @@ rm -rf ~/Work/xpack-dev-tools/*/build-assets/build
573574

574575
### Generate the GitHub workflows
575576

576-
Run the **generate-workflows** xPack action to update the
577+
Run the **generate-workflows** xpm/xPack action to update the
577578
GitHub workflow files.
578579

579580
```sh
@@ -582,7 +583,7 @@ xpm run generate-workflows -C ~/Work/xpack-dev-tools/sed-xpack.git/build-assets
582583

583584
### Commit and push
584585

585-
- commit with the message **Re-generate workflows**
586+
- commit with the message **re-generate workflows**
586587
- push the `xpack-development` branch to GitHub
587588

588589
<FirstProductionRun/>
@@ -606,7 +607,7 @@ xpm run trigger-workflow-build-linux-arm64 -C ~/Work/xpack-dev-tools/sed-xpack.g
606607
xpm run trigger-workflow-build-linux-arm -C ~/Work/xpack-dev-tools/sed-xpack.git/build-assets
607608
```
608609

609-
The scripts behind these actions require the `XPACK_DEV_TOOLS_FG_DISPATCH_TOKEN`
610+
The scripts behind these actions require the `GITHUB_API_DISPATCH_TOKEN`
610611
variable to be present
611612
in the environment, and the organization `PUBLISH_TOKEN` to be visible in the
612613
SettingsAction
@@ -625,6 +626,8 @@ The workflow results and logs are available from the
625626
Update the values in `website/docs/maintainer/_github-actions-durations.mdx`
626627
with those shown by GitHub Actions.
627628

629+
Commit with the message _**website: update actions durations**_.
630+
628631
The resulting binaries are available for testing from
629632
[pre-releases/test](https://github.com/xpack-dev-tools/pre-releases/releases/tag/test/).
630633

@@ -648,13 +651,20 @@ xpm run trigger-workflow-test-docker-linux-x64 -C ~/Work/xpack-dev-tools/sed-xpa
648651
xpm run trigger-workflow-test-docker-linux-arm -C ~/Work/xpack-dev-tools/sed-xpack.git/build-assets
649652
```
650653

651-
The scripts behind these accessible require the `XPACK_DEV_TOOLS_FG_DISPATCH_TOKEN` variable to be present
654+
The scripts behind these accessible require the `GITHUB_API_DISPATCH_TOKEN` variable to be present
652655
in the environment.
653656

654657
These actions use the `xpack-development` branch of this repo and the
655658
[pre-releases/test](https://github.com/xpack-dev-tools/pre-releases/releases/tag/test/)
656659
binaries.
657660

661+
:::caution
662+
663+
Some of the `docker-linux-arm` tests have an issue on Debian and the
664+
**Clean working area** step fails.
665+
666+
:::
667+
658668
The tests results are available from the
659669
[GitHub Actions](https://github.com/xpack-dev-tools/sed-xpack/actions/) page.
660670

@@ -666,7 +676,7 @@ with previous runs.
666676
Since GitHub Actions provides a limited range of versions for the macOS
667677
runner, the multi-version macOS tests run on Travis.
668678

669-
To trigger the Travis test, run the **trigger-travis-macos** xPack action:
679+
To trigger the Travis test, run the **trigger-travis-macos** xpm/xPack action:
670680

671681
```sh
672682
xpm run trigger-travis-macos -C ~/Work/xpack-dev-tools/sed-xpack.git/build-assets
@@ -708,10 +718,10 @@ xattr -cr ${HOME}/Downloads/xpack-*
708718

709719
- in `CHANGELOG.md`, add the release date and a message
710720
like _**\* v{customField('xpackVersion')} released**_
711-
- commit with _**CHANGELOG update**_
721+
- commit with the message _**CHANGELOG update**_
712722
- check and possibly update the `build-assets/templates/body-github-release-liquid.mdx`
713723
- push the `xpack-development` branch to GitHub
714-
- run the **trigger-workflow-publish-release** xPack action:
724+
- run the **trigger-workflow-publish-release** xpm/xPack action:
715725

716726
```sh
717727
xpm run trigger-workflow-publish-release -C ~/Work/xpack-dev-tools/sed-xpack.git/build-assets
@@ -732,13 +742,17 @@ with all binaries attached.
732742
- do **not** enable Discussions yet
733743
- click the **Publish release** button
734744

735-
Note: at this moment the system should send a notification to all clients
736-
watching this project.
745+
:::info
746+
747+
At this moment the system should send an email notification to all clients
748+
watching the sed-xpack project.
749+
750+
:::
737751

738752
### Prepare a new blog post
739753

740754
- check and possibly update the `website/blog/_templates/blog-post-release-part-[12]-liquid.md`
741-
- run the **generate-website-blog-post** xPack action;
755+
- run the **generate-website-blog-post** xpm/xPack action;
742756
this will add a file in the `website/blog` folder:
743757

744758
```sh
@@ -747,26 +761,26 @@ xpm run generate-website-blog-post -C ~/Work/xpack-dev-tools/sed-xpack.git/build
747761

748762
- edit the front matter properties
749763
- select the correct summary
750-
- commit with _**blog post release {customField('xpackVersion')} published**_
764+
- commit with the message _**website: blog post release {customField('xpackVersion')} published**_
751765

752766
### Update the web install page
753767

754768
- check and possibly update the output of the `--version` runs in
755769
- `website/docs/install/_automatic-install-quick-test.mdx`
756770
- `website/docs/install/_manual-install-quick-test.mdx`
757-
- commit changes
771+
- commit with the message _**website: update quick tests**_
758772

759773
### Check the list of links in top package.json
760774

761-
- open the `package.json` file
775+
- open the top `package.json` file
762776
- check if the links in the `bin` property cover the actual binaries
763777
- if necessary, also check on Windows
764778

765779
### Update the package.json list of binaries
766780

767781
- select the `xpack-development` branch
768782
- be sure that the binaries were attached to the pre-release
769-
- run the **update-package-binaries** xPack action:
783+
- run the **update-package-binaries** xpm/xPack action:
770784

771785
```sh
772786
xpm run update-package-binaries -C ~/Work/xpack-dev-tools/sed-xpack.git/build-assets
@@ -778,15 +792,15 @@ xpm run update-package-binaries -C ~/Work/xpack-dev-tools/sed-xpack.git/build-as
778792
- from the release, check the SHA & file names
779793
- compare the SHA sums with those shown by `cat *.sha`
780794
- check the executable names
781-
- commit all changes, use a message like
795+
- commit all changes with the message
782796
_**package.json: update urls for {customField('xpackVersion')}.{customField('npmSubversion')} release**_
783797

784798
### Publish on the npmjs.com server
785799

786800
- select the `xpack-development` branch
787801
- check the latest commits `xpm run git-log`
788802
- update `CHANGELOG.md`, add a line like _**\* v{customField('xpackVersion')} published on npmjs.com**_
789-
- commit with a message like _**CHANGELOG: publish npm v{customField('xpackVersion')}.{customField('npmSubversion')}**_
803+
- commit with the message _**CHANGELOG: publish npm v{customField('xpackVersion')}.{customField('npmSubversion')}**_
790804
- `npm pack` and check the content of the archive, which should list
791805
only the `package.json`, the `README.md`, `LICENSE` and `CHANGELOG.md`;
792806
possibly adjust `.npmignore`
@@ -816,7 +830,7 @@ After a few moments the version will be visible at
816830

817831
### Test if the binaries can be installed with xpm
818832

819-
Run the **trigger-workflow-test-xpm** xPack action:
833+
Run the **trigger-workflow-test-xpm** xpm/xPack action:
820834

821835
```sh
822836
xpm run trigger-workflow-test-xpm -C ~/Work/xpack-dev-tools/sed-xpack.git/build-assets
@@ -833,10 +847,14 @@ The tests results are available from the
833847

834848
When the release is considered stable, promote it as `latest`:
835849

850+
<CodeBlock language="sh"> {
851+
`npm dist-tag add @xpack-dev-tools/sed@${customField('xpackVersion')}.${customField('npmSubversion')} latest
852+
`} </CodeBlock>
853+
854+
Check the result:
855+
836856
<CodeBlock language="sh"> {
837857
`npm dist-tag ls @xpack-dev-tools/sed
838-
npm dist-tag add @xpack-dev-tools/sed@${customField('xpackVersion')}.${customField('npmSubversion')} latest
839-
npm dist-tag ls @xpack-dev-tools/sed
840858
`} </CodeBlock>
841859

842860
In case the release proves problematic and needs to be unpublished:
@@ -850,23 +868,26 @@ In case the release proves problematic and needs to be unpublished:
850868
Validate the web site content in a local build via the npm `build` script:
851869

852870
```sh
853-
npm --prefix website run build
871+
npm run build -C website
854872
```
855873

856874
### Publish the website
857875

876+
- stop the local web server
877+
- select the `website` branch
858878
- merge `xpack-development` into `website`
859879
- push the `website` branch to GitHub
860-
861-
At this moment an automated GitHub Action will generate and publish the website.
862-
880+
:::info
881+
At this moment an automated GitHub Action will generate and publish the website.
882+
:::
863883
- the new release blog post is
864884
in https://xpack-dev-tools.github.io/sed-xpack/blog/
865885
- remember the post URL, since it must be used to update the release page
866886
and the X/Twitter announcement
887+
- switch to https://xpack-dev-tools.github.io/sed-xpack/docs/maintainer/#update-the-xpack-branch
867888

868889
The `website` branch may be subsequently updated, as long as the
869-
version in `package.json` is not changed.
890+
version in the top `package.json` is not changed.
870891

871892
### Update the `xpack` branch
872893

@@ -888,7 +909,8 @@ Avoid further updates to the `xpack` branch until the next release.
888909
- check the download counter, it should match the number of tests
889910
- add a link to the Web blog `[Continue reading »]()`; use an same blog URL
890911
- remove the _tests only_ notice
891-
- **disable** the **pre-release** button
912+
- **disable** the **Set as a pre-release** button
913+
- **enable** the **Set as the latest release** button
892914
- click the **Update Release** button
893915

894916
### Check SourceForge mirror
@@ -904,7 +926,7 @@ Avoid further updates to the `xpack` branch until the next release.
904926

905927
### Clean the work area
906928

907-
Run the **trigger-workflow-deep-clean** xPack action
929+
Run the **trigger-workflow-deep-clean** xpm/xPack action
908930

909931
```sh
910932
xpm run trigger-workflow-deep-clean -C ~/Work/xpack-dev-tools/sed-xpack.git/build-assets
@@ -915,6 +937,15 @@ This will remove the build folders on all self-hosted runners.
915937
The results are available from the
916938
[GitHub Actions](https://github.com/xpack-dev-tools/sed-xpack/actions/) page.
917939

940+
### Close possible open issues
941+
942+
Check GitHub issues and pull requests:
943+
944+
- https://github.com/xpack-dev-tools/sed-xpack/issues
945+
- https://github.com/xpack-dev-tools/sed-xpack/pulls
946+
947+
Close those that were addressed.
948+
918949
## Share on Twitter
919950

920951
- in a separate browser windows, open [X/Twitter](https://twitter.com)

website/docusaurus.config.ts

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -335,19 +335,29 @@ const config: Config = {
335335
'aria-label': 'GitHub repository',
336336
},
337337
{
338-
label: `v${customFields.xpackVersion}`,
339-
position: 'right',
340-
href: `https://github.com/xpack-dev-tools/sed-xpack/releases/tag/v${customFields.xpackVersion}`,
341-
},
342-
{
343-
href: 'https://github.com/xpack-dev-tools/',
344-
label: 'xpack-dev-tools',
338+
type: 'dropdown',
339+
href: 'https://github.com/xpack-dev-tools/sed-xpack/',
345340
position: 'right',
341+
label: 'GitHub',
342+
items: [
343+
{
344+
label: `sed-xpack`,
345+
href: `https://github.com/xpack-dev-tools/sed-xpack/`,
346+
},
347+
{
348+
label: 'xpack-dev-tools org',
349+
href: 'https://github.com/xpack-dev-tools/',
350+
},
351+
{
352+
label: 'xpack org',
353+
href: 'https://github.com/xpack/',
354+
},
355+
]
346356
},
347357
{
348-
href: 'https://github.com/xpack/',
349-
label: 'xpack',
358+
label: `${customFields.xpackVersion}`,
350359
position: 'right',
360+
href: `https://github.com/xpack-dev-tools/sed-xpack/releases/tag/v${customFields.xpackVersion}`,
351361
},
352362
],
353363
},
@@ -408,11 +418,11 @@ const config: Config = {
408418
href: 'https://github.com/xpack-dev-tools/sed-xpack/',
409419
},
410420
{
411-
label: 'GitHub xpack-dev-tools',
421+
label: 'GitHub xpack-dev-tools org',
412422
href: 'https://github.com/xpack-dev-tools/',
413423
},
414424
{
415-
label: 'GitHub xpack',
425+
label: 'GitHub xpack org',
416426
href: 'https://github.com/xpack/',
417427
},
418428
],

0 commit comments

Comments
 (0)