docs(row321): remove whitespace from the embedded diff receipt (#1817)
(cherry picked from commit d9400f0d36)
This commit is contained in:
1 parent
5283d3745f
commit
3fd5307e1e
1 file changed
+10
-21
@@ -58,17 +58,14 @@ packages/cli/tests/case2-unit.test.mjs:20:const PRECHECK = join(REPO, "scripts",
|
|||||||
packages/cli/tests/case2-unit.test.mjs:588:// ---- case2-precheck.sh ----
|
packages/cli/tests/case2-unit.test.mjs:588:// ---- case2-precheck.sh ----
|
||||||
```
|
```
|
||||||
|
|
||||||
## Run-sheet diff against the pinned base
|
## Run-sheet diff against the pinned base (git diff --unified=0)
|
||||||
|
|
||||||
```diff
|
```diff
|
||||||
diff --git a/docs/guides/host-run-sheet.md b/docs/guides/host-run-sheet.md
|
diff --git a/docs/guides/host-run-sheet.md b/docs/guides/host-run-sheet.md
|
||||||
index d2ba28d7c..96fd4f363 100644
|
index d2ba28d7c..96fd4f363 100644
|
||||||
--- a/docs/guides/host-run-sheet.md
|
--- a/docs/guides/host-run-sheet.md
|
||||||
+++ b/docs/guides/host-run-sheet.md
|
+++ b/docs/guides/host-run-sheet.md
|
||||||
@@ -207,8 +207,21 @@ install -o mosaic -g mosaic -m 0600 /root/<sha>.bundle /srv/mosaic/incoming/<sha
|
@@ -209,0 +210,9 @@ sudo -u mosaic -H git clone -q -b refactor /srv/mosaic/incoming/<sha>.bundle /sr
|
||||||
sudo -u mosaic -H git clone -q -b refactor /srv/mosaic/incoming/<sha>.bundle /srv/mosaic/src/mosaic-stack
|
|
||||||
```
|
|
||||||
|
|
||||||
+After a first install, once both units are running (section 10), adopt the installed copy before
|
+After a first install, once both units are running (section 10), adopt the installed copy before
|
||||||
+any activate or upgrade. This step runs only on Mos's go, with Jason or Mos running it
|
+any activate or upgrade. This step runs only on Mos's go, with Jason or Mos running it
|
||||||
+(`scripts/stack-release.sh:14`):
|
+(`scripts/stack-release.sh:14`):
|
||||||
@@ -78,29 +75,16 @@ index d2ba28d7c..96fd4f363 100644
|
|||||||
+ /srv/mosaic/src/mosaic-stack/scripts/stack-release.sh adopt <business> --instance dev --units external
|
+ /srv/mosaic/src/mosaic-stack/scripts/stack-release.sh adopt <business> --instance dev --units external
|
||||||
+```
|
+```
|
||||||
+
|
+
|
||||||
Each upgrade, before `stack-upgrade.sh upgrade`:
|
@@ -211,0 +221,4 @@ Each upgrade, before `stack-upgrade.sh upgrade`:
|
||||||
|
|
||||||
+Only the first upgrade after adopt takes `--no-rehearsal`: append it to the upgrade command below.
|
+Only the first upgrade after adopt takes `--no-rehearsal`: append it to the upgrade command below.
|
||||||
+Adopt writes no backup, so omitting the flag then refuses `no-backup`. Subsequent upgrades omit it;
|
+Adopt writes no backup, so omitting the flag then refuses `no-backup`. Subsequent upgrades omit it;
|
||||||
+when a backup exists, supplying it refuses `rehearsal-required`.
|
+when a backup exists, supplying it refuses `rehearsal-required`.
|
||||||
+
|
+
|
||||||
```sh
|
@@ -246,0 +260 @@ step requiring Mos's go (`scripts/stack-copy.sh:3`); the install does not create
|
||||||
echo "<bundle sha256> /root/<sha>.bundle" | sha256sum -c -
|
|
||||||
(
|
|
||||||
@@ -244,10 +257,13 @@ When a run doesn't exit 0, send Mos the exit and the last lines of `/var/log/mos
|
|
||||||
After `case2-install.sh` succeeds, create the human CLI wrapper before running
|
|
||||||
`stack-copy.sh check --units external`. Creating this wrapper is a separate live
|
|
||||||
step requiring Mos's go (`scripts/stack-copy.sh:3`); the install does not create it. Run only on that go:
|
|
||||||
+The step runs under sudo's `secure_path`, so it sets its own PATH and umask.
|
+The step runs under sudo's `secure_path`, so it sets its own PATH and umask.
|
||||||
|
@@ -250,0 +265,2 @@ cd / || exit 1
|
||||||
```sh
|
|
||||||
sudo -u mosaic -H /bin/sh <<'MOSAIC_WRAPPER'
|
|
||||||
cd / || exit 1
|
|
||||||
+umask 077
|
+umask 077
|
||||||
+PATH=/opt/mosaic-stack/node-<v>/bin:/usr/sbin:/usr/bin:/sbin:/bin; export PATH
|
+PATH=/opt/mosaic-stack/node-<v>/bin:/usr/sbin:/usr/bin:/sbin:/bin; export PATH
|
||||||
mkdir -p -- "$HOME/.npm-global/bin" || exit 1
|
|
||||||
"$HOME/src/mosaic-stack/scripts/stack-copy.sh" wrapper <sha> --create
|
|
||||||
MOSAIC_WRAPPER
|
|
||||||
```
|
```
|
||||||
|
|
||||||
## Verification
|
## Verification
|
||||||
@@ -110,3 +94,8 @@ No test run or slot is required under sage-3791. Verification is static: the
|
|||||||
required grep and positive control above, exact brief/base pins, scoped diff,
|
required grep and positive control above, exact brief/base pins, scoped diff,
|
||||||
and git diff --check. Reviewer Boyd and Sage own review/landing; no approval
|
and git diff --check. Reviewer Boyd and Sage own review/landing; no approval
|
||||||
or landing is claimed here.
|
or landing is claimed here.
|
||||||
|
|
||||||
|
Receipt correction: the first commit embedded ordinary diff context lines that
|
||||||
|
contain a single space. git diff --check flagged those as trailing whitespace.
|
||||||
|
This follow-up uses the exact zero-context diff instead. The run sheet is
|
||||||
|
unchanged, no tests or Node commands run, and no amend or force-push is used.
|
||||||
Reference in new issue
Block a user