diff --git a/README.md b/README.md index b31969ef3..4e387d2f6 100644 --- a/README.md +++ b/README.md @@ -128,7 +128,7 @@ people groups of the world. When you work here, the goal is one of these: every other plugin. - **Land on `development`**, one change at a time through the lock, with `gates:pre`, `gates:post` and the landing checks passing. `main` is production and moves only on a publish. -- These 10 maps are in production: the 9 in the gallery, plus the country map for DX Life's country pages. The +- These 8 maps are in production: the 7 production maps in the gallery, plus the country map for DX Life's country pages. The other maps are experimental: leave them as they are unless your task is one of them. @@ -138,10 +138,10 @@ people groups of the world. When you work here, the goal is one of these: ## The production maps -**Nine maps DX uses today, all together in the Research Gallery**, which DX Life publishes as -**Deep Research**; each one is also a plugin you can embed on its own. The seven below plus Country Posters -and Poster Design (see Posterverse). A tenth production map, the country map (`country-map`), draws DX Life's -country pages; it isn't in the gallery. +**Seven production maps DX uses today, all together in the Research Gallery**, which DX Life publishes +as **Deep Research**; each one is also a plugin you can embed on its own. The gallery also carries two +poster plugins still marked experimental, Country Posters and Poster Design (see Posterverse). An eighth +production map, the country map (`country-map`), draws DX Life's country pages; it isn't in the gallery. @@ -327,7 +327,7 @@ improvement on the next build.
-What the Research Gallery is made of — nine production maps, an Experimental shelf, all five capabilities in one plugin +What the Research Gallery is made of — seven production maps, two poster plugins, an Experimental shelf, all five capabilities in one plugin ```text Research Gallery capability 5 @@ -807,18 +807,18 @@ these jobs to its agents. ``` Only a change to the build itself (its config or its dependencies) reaches every bundle: `BUILD_ALLOW=1 bun run build`. -7. **Publish, when a person approves it:** tag the release the landing branch is on now as the - rollback point, fast-forward the landing branch to a pilot commit that passed the checks, tag it, and - deploy from the tag: +7. **Publish, when a person approves it:** make sure the release the landing branch is on now has its + own version tag (that tag is the rollback point), fast-forward the landing branch to a pilot commit + that passed the checks, tag it, and deploy from the tag: ```bash git fetch origin && git switch main && git merge --ff-only origin/main - git tag -a rollback-v1.0.0 -m "Rollback point: the release before v1.0.0" && git push origin rollback-v1.0.0 + git tag -a v0.2.0 -m "Release v0.2.0" && git push origin v0.2.0 # the outgoing release, if untagged git merge --ff-only # a commit that passed the checks bun run gates:pre && bun run gates:post # the checks must pass on exactly this commit git tag -a v1.0.0 -m "Release v1.0.0" && git push origin main v1.0.0 ``` The tag's `public/dx-maps/` folder is the built site: deploy that, and build the landing demo from - the same tag ([how to deploy](./documentation/DEPLOY.md)). To go back, deploy the rollback tag. Publish to a public host, such as GitHub, only from + the same tag ([how to deploy](./documentation/DEPLOY.md)). To go back, deploy the previous release's tag. Publish to a public host, such as GitHub, only from the landing branch and only when it is ready. ### Developing in the cloud with a swarm