Skip to content

Commit 1120d39

Browse files
committed
website: updates
1 parent f9f40db commit 1120d39

File tree

3 files changed

+92
-51
lines changed

3 files changed

+92
-51
lines changed

website/docs/developer/index.mdx

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

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

191191
</details>
192192

193193
## Prerequisites
194194

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

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

website/docs/maintainer/index.mdx

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

221221
### Update `CHANGELOG.md`
222222

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

232225
```txt
@@ -257,6 +250,14 @@ to:
257250
*
258251
```
259252

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

262263
Be sure that the latest commit that updates `VERSION` is pushed
@@ -430,7 +431,7 @@ via HomeBrew, and make a link to `/usr/local/bin`.
430431

431432
:::
432433

433-
- commit with _**website: update folder hierarchies**_.
434+
Commit with the message _**website: update folder hierarchies**_.
434435

435436
### Update the list of links in top package.json
436437

@@ -439,14 +440,14 @@ sequence, for each platform (Windows, macOS, GNU/Linux),
439440
and check the
440441
differences compared to the repository.
441442

442-
Commit if necessary with _**package.json: update executables links**_
443+
Commit if necessary with the message _**package.json: update executables links**_.
443444

444445
### Update the durations of the development builds
445446

446447
In `website/docs/maintainer/_development-durations.mdx`, update
447448
the durations of the builds.
448449

449-
Commit if necessary with _**website: update development durations**_
450+
Commit with the message _**website: update development durations**_.
450451

451452
### How to build a debug version
452453

@@ -537,7 +538,7 @@ to `"@xpack-dev-tools/xbb-helper":`
537538

538539
### Commit the changes to `build-assets/package.json`
539540

540-
Use the message **build-assets/package.json: bump deps**.
541+
Commit with the message _**build-assets/package.json: bump deps**_.
541542

542543
### Check for disk space
543544

@@ -584,7 +585,7 @@ rm -rf ~/Work/xpack-dev-tools/*/build-assets/build
584585

585586
### Generate the GitHub workflows
586587

587-
Run the **generate-workflows** xPack action to update the
588+
Run the **generate-workflows** xpm/xPack action to update the
588589
GitHub workflow files.
589590

590591
```sh
@@ -593,7 +594,7 @@ xpm run generate-workflows -C ~/Work/xpack-dev-tools/gcc-xpack.git/build-assets
593594

594595
### Commit and push
595596

596-
- commit with the message **Re-generate workflows**
597+
- commit with the message **re-generate workflows**
597598
- push the `xpack-development` branch to GitHub
598599

599600
<FirstProductionRun/>
@@ -619,7 +620,7 @@ xpm run trigger-workflow-build-linux-arm64 -C ~/Work/xpack-dev-tools/gcc-xpack.g
619620
xpm run trigger-workflow-build-linux-arm -C ~/Work/xpack-dev-tools/gcc-xpack.git/build-assets
620621
```
621622

622-
The scripts behind these actions require the `XPACK_DEV_TOOLS_FG_DISPATCH_TOKEN`
623+
The scripts behind these actions require the `GITHUB_API_DISPATCH_TOKEN`
623624
variable to be present
624625
in the environment, and the organization `PUBLISH_TOKEN` to be visible in the
625626
SettingsAction
@@ -638,6 +639,8 @@ The workflow results and logs are available from the
638639
Update the values in `website/docs/maintainer/_github-actions-durations.mdx`
639640
with those shown by GitHub Actions.
640641

642+
Commit with the message _**website: update actions durations**_.
643+
641644
The resulting binaries are available for testing from
642645
[pre-releases/test](https://github.com/xpack-dev-tools/pre-releases/releases/tag/test/).
643646

@@ -661,13 +664,20 @@ xpm run trigger-workflow-test-docker-linux-x64 -C ~/Work/xpack-dev-tools/gcc-xpa
661664
xpm run trigger-workflow-test-docker-linux-arm -C ~/Work/xpack-dev-tools/gcc-xpack.git/build-assets
662665
```
663666

664-
The scripts behind these accessible require the `XPACK_DEV_TOOLS_FG_DISPATCH_TOKEN` variable to be present
667+
The scripts behind these accessible require the `GITHUB_API_DISPATCH_TOKEN` variable to be present
665668
in the environment.
666669

667670
These actions use the `xpack-development` branch of this repo and the
668671
[pre-releases/test](https://github.com/xpack-dev-tools/pre-releases/releases/tag/test/)
669672
binaries.
670673

674+
:::caution
675+
676+
Some of the `docker-linux-arm` tests have an issue on Debian and the
677+
**Clean working area** step fails.
678+
679+
:::
680+
671681
The tests results are available from the
672682
[GitHub Actions](https://github.com/xpack-dev-tools/gcc-xpack/actions/) page.
673683

@@ -679,7 +689,7 @@ with previous runs.
679689
Since GitHub Actions provides a limited range of versions for the macOS
680690
runner, the multi-version macOS tests run on Travis.
681691

682-
To trigger the Travis test, run the **trigger-travis-macos** xPack action:
692+
To trigger the Travis test, run the **trigger-travis-macos** xpm/xPack action:
683693

684694
```sh
685695
xpm run trigger-travis-macos -C ~/Work/xpack-dev-tools/gcc-xpack.git/build-assets
@@ -721,10 +731,10 @@ xattr -cr ${HOME}/Downloads/xpack-*
721731

722732
- in `CHANGELOG.md`, add the release date and a message
723733
like _**\* v{customField('xpackVersion')} released**_
724-
- commit with _**CHANGELOG update**_
734+
- commit with the message _**CHANGELOG update**_
725735
- check and possibly update the `build-assets/templates/body-github-release-liquid.mdx`
726736
- push the `xpack-development` branch to GitHub
727-
- run the **trigger-workflow-publish-release** xPack action:
737+
- run the **trigger-workflow-publish-release** xpm/xPack action:
728738

729739
```sh
730740
xpm run trigger-workflow-publish-release -C ~/Work/xpack-dev-tools/gcc-xpack.git/build-assets
@@ -745,13 +755,17 @@ with all binaries attached.
745755
- do **not** enable Discussions yet
746756
- click the **Publish release** button
747757

748-
Note: at this moment the system should send a notification to all clients
749-
watching this project.
758+
:::info
759+
760+
At this moment the system should send an email notification to all clients
761+
watching the gcc-xpack project.
762+
763+
:::
750764

751765
### Prepare a new blog post
752766

753767
- check and possibly update the `website/blog/_templates/blog-post-release-part-[12]-liquid.md`
754-
- run the **generate-website-blog-post** xPack action;
768+
- run the **generate-website-blog-post** xpm/xPack action;
755769
this will add a file in the `website/blog` folder:
756770

757771
```sh
@@ -760,26 +774,26 @@ xpm run generate-website-blog-post -C ~/Work/xpack-dev-tools/gcc-xpack.git/build
760774

761775
- edit the front matter properties
762776
- select the correct summary
763-
- commit with _**blog post release {customField('xpackVersion')} published**_
777+
- commit with the message _**website: blog post release {customField('xpackVersion')} published**_
764778

765779
### Update the web install page
766780

767781
- check and possibly update the output of the `--version` runs in
768782
- `website/docs/install/_automatic-install-quick-test.mdx`
769783
- `website/docs/install/_manual-install-quick-test.mdx`
770-
- commit changes
784+
- commit with the message _**website: update quick tests**_
771785

772786
### Check the list of links in top package.json
773787

774-
- open the `package.json` file
788+
- open the top `package.json` file
775789
- check if the links in the `bin` property cover the actual binaries
776790
- if necessary, also check on Windows
777791

778792
### Update the package.json list of binaries
779793

780794
- select the `xpack-development` branch
781795
- be sure that the binaries were attached to the pre-release
782-
- run the **update-package-binaries** xPack action:
796+
- run the **update-package-binaries** xpm/xPack action:
783797

784798
```sh
785799
xpm run update-package-binaries -C ~/Work/xpack-dev-tools/gcc-xpack.git/build-assets
@@ -791,15 +805,15 @@ xpm run update-package-binaries -C ~/Work/xpack-dev-tools/gcc-xpack.git/build-as
791805
- from the release, check the SHA & file names
792806
- compare the SHA sums with those shown by `cat *.sha`
793807
- check the executable names
794-
- commit all changes, use a message like
808+
- commit all changes with the message
795809
_**package.json: update urls for {customField('xpackVersion')}.{customField('npmSubversion')} release**_
796810

797811
### Publish on the npmjs.com server
798812

799813
- select the `xpack-development` branch
800814
- check the latest commits `xpm run git-log`
801815
- update `CHANGELOG.md`, add a line like _**\* v{customField('xpackVersion')} published on npmjs.com**_
802-
- commit with a message like _**CHANGELOG: publish npm v{customField('xpackVersion')}.{customField('npmSubversion')}**_
816+
- commit with the message _**CHANGELOG: publish npm v{customField('xpackVersion')}.{customField('npmSubversion')}**_
803817
- `npm pack` and check the content of the archive, which should list
804818
only the `package.json`, the `README.md`, `LICENSE` and `CHANGELOG.md`;
805819
possibly adjust `.npmignore`
@@ -829,7 +843,7 @@ After a few moments the version will be visible at
829843

830844
### Test if the binaries can be installed with xpm
831845

832-
Run the **trigger-workflow-test-xpm** xPack action:
846+
Run the **trigger-workflow-test-xpm** xpm/xPack action:
833847

834848
```sh
835849
xpm run trigger-workflow-test-xpm -C ~/Work/xpack-dev-tools/gcc-xpack.git/build-assets
@@ -848,16 +862,20 @@ and copy the markdown file to `website/docs/tests`.
848862
Edit the `website/docs/tests/index.md` file to add the
849863
new page.
850864

851-
Commit with _**website: add tests results**_.
865+
Commit with the message _**website: add tests results**_.
852866

853867
### Tag the npm package as `latest`
854868

855869
When the release is considered stable, promote it as `latest`:
856870

871+
<CodeBlock language="sh"> {
872+
`npm dist-tag add @xpack-dev-tools/gcc@${customField('xpackVersion')}.${customField('npmSubversion')} latest
873+
`} </CodeBlock>
874+
875+
Check the result:
876+
857877
<CodeBlock language="sh"> {
858878
`npm dist-tag ls @xpack-dev-tools/gcc
859-
npm dist-tag add @xpack-dev-tools/gcc@${customField('xpackVersion')}.${customField('npmSubversion')} latest
860-
npm dist-tag ls @xpack-dev-tools/gcc
861879
`} </CodeBlock>
862880

863881
In case the release proves problematic and needs to be unpublished:
@@ -871,23 +889,26 @@ In case the release proves problematic and needs to be unpublished:
871889
Validate the web site content in a local build via the npm `build` script:
872890

873891
```sh
874-
npm --prefix website run build
892+
npm run build -C website
875893
```
876894

877895
### Publish the website
878896

897+
- stop the local web server
898+
- select the `website` branch
879899
- merge `xpack-development` into `website`
880900
- push the `website` branch to GitHub
881-
882-
At this moment an automated GitHub Action will generate and publish the website.
883-
901+
:::info
902+
At this moment an automated GitHub Action will generate and publish the website.
903+
:::
884904
- the new release blog post is
885905
in https://xpack-dev-tools.github.io/gcc-xpack/blog/
886906
- remember the post URL, since it must be used to update the release page
887907
and the X/Twitter announcement
908+
- switch to https://xpack-dev-tools.github.io/gcc-xpack/docs/maintainer/#update-the-xpack-branch
888909

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

892913
### Update the `xpack` branch
893914

@@ -909,7 +930,8 @@ Avoid further updates to the `xpack` branch until the next release.
909930
- check the download counter, it should match the number of tests
910931
- add a link to the Web blog `[Continue reading »]()`; use an same blog URL
911932
- remove the _tests only_ notice
912-
- **disable** the **pre-release** button
933+
- **disable** the **Set as a pre-release** button
934+
- **enable** the **Set as the latest release** button
913935
- click the **Update Release** button
914936

915937
### Check SourceForge mirror
@@ -925,7 +947,7 @@ Avoid further updates to the `xpack` branch until the next release.
925947

926948
### Clean the work area
927949

928-
Run the **trigger-workflow-deep-clean** xPack action
950+
Run the **trigger-workflow-deep-clean** xpm/xPack action
929951

930952
```sh
931953
xpm run trigger-workflow-deep-clean -C ~/Work/xpack-dev-tools/gcc-xpack.git/build-assets
@@ -936,6 +958,15 @@ This will remove the build folders on all self-hosted runners.
936958
The results are available from the
937959
[GitHub Actions](https://github.com/xpack-dev-tools/gcc-xpack/actions/) page.
938960

961+
### Close possible open issues
962+
963+
Check GitHub issues and pull requests:
964+
965+
- https://github.com/xpack-dev-tools/gcc-xpack/issues
966+
- https://github.com/xpack-dev-tools/gcc-xpack/pulls
967+
968+
Close those that were addressed.
969+
939970
## Share on Twitter
940971

941972
- 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/gcc-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/gcc-xpack/',
345340
position: 'right',
341+
label: 'GitHub',
342+
items: [
343+
{
344+
label: `gcc-xpack`,
345+
href: `https://github.com/xpack-dev-tools/gcc-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/gcc-xpack/releases/tag/v${customFields.xpackVersion}`,
351361
},
352362
],
353363
},
@@ -408,11 +418,11 @@ const config: Config = {
408418
href: 'https://github.com/xpack-dev-tools/gcc-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)