From 575296fcac96dc19d5e8325176f4669861fddbc6 Mon Sep 17 00:00:00 2001 From: Josh Lehman Date: Tue, 7 Feb 2023 10:24:10 -0800 Subject: [PATCH 1/6] Update MAINTAINERS.md add post-release deployment instructions --- MAINTAINERS.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index c58c227a9..8967439af 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -126,7 +126,8 @@ git push origin - [ ] ssh into `~zod` - [ ] Check to ensure that nobody else is ssh'd into `~zod`, by running `screen -ls` and verifying no sessions are attached. - [ ] Attach to the screen session using `screen -x` -- [ ] Install the contents of the `%kids` desk on `~marnec-dozzod-marzod` into our `%base`: `|merge %base ~marnec-dozzod-marzod %kids, =gem %only-that` +- [ ] Install the contents of the `%kids` desk on `~marnec-dozzod-marzod` into our `%base`: `|merge %base ~marnec-dozzod-marzod %kids, =gem % +` - [ ] Check that `~zod` has updated to the latest release. For a Kelvin release, you can run `zuse` in the Dojo. Each non-Kelvin release might its own way of checking whether the update has completed, possibly through checking the `%cz` hash of the `%base` desk matches the hash on `~marnec-dozzod-marzod` by comparing the outputs of `+vat %base` on both ships. - [ ] Merge `~zod`'s `%base` desk into its `%kids` desk to distribute the new code to the network: `|merge %kids our %base, =gem %only-that` - [ ] Before exiting the screen session on `~zod`, make sure the screen session is not left in copy mode for a long period of time, since that will disrupt `~zod`'s operation. @@ -143,6 +144,17 @@ git push origin - [ ] Merge `master` back into `develop`. - [ ] Cut a new release branch from `develop`. The branch should have the format `release/urbit-os-vX.XX` +### Post-Release Deployments + +We'll now need to deploy the new release candidate to the pre-release moons. + +- On `~marnec-dozzod-marzod`: + - [ ] `|merge %base ~binnec-dozzod-marzod %kids, =gem %only-that` to update `~marnec` with the contents of the GH release branch + - [ ] `|merge %kids our %base, =gem %only-that` to OTA the release candidate to subscribers +- When ready to deploy the release candidate to App Developers, on `~doznec-dozzod-marzod`: + - [ ] `|merge %base ~marnec-dozzod-marzod %kids, =gem %only-that` to update `~doznec` with the release candidate + - [ ] `|merge %kids our %base, =gem %only-that` to OTA the release candidate to subscribers + ### Post-Release Checks - [ ] Check that `~marzod` and other distribution stars are receiving the update by running `|ames-sift ~zod` and `|ames-verb %rcv %ges`. You should see lots of packets from `~zod`. Once you have confirmed packets are flowing, run `|ames-sift` and `|ames-verb` with no arguments to reset the verbosity state. - [ ] Check that planets are receiving the update. They should start updating within an hour or so. From 8b2f555d6e1e3bc173ad701db6a6206c35ca1bb0 Mon Sep 17 00:00:00 2001 From: Josh Lehman Date: Tue, 7 Feb 2023 10:25:30 -0800 Subject: [PATCH 2/6] Update MAINTAINERS.md --- MAINTAINERS.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 8967439af..d5f28ad85 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -126,8 +126,7 @@ git push origin - [ ] ssh into `~zod` - [ ] Check to ensure that nobody else is ssh'd into `~zod`, by running `screen -ls` and verifying no sessions are attached. - [ ] Attach to the screen session using `screen -x` -- [ ] Install the contents of the `%kids` desk on `~marnec-dozzod-marzod` into our `%base`: `|merge %base ~marnec-dozzod-marzod %kids, =gem % -` +- [ ] Install the contents of the `%kids` desk on `~marnec-dozzod-marzod` into our `%base`: `|merge %base ~marnec-dozzod-marzod %kids, =gem %only-that` - [ ] Check that `~zod` has updated to the latest release. For a Kelvin release, you can run `zuse` in the Dojo. Each non-Kelvin release might its own way of checking whether the update has completed, possibly through checking the `%cz` hash of the `%base` desk matches the hash on `~marnec-dozzod-marzod` by comparing the outputs of `+vat %base` on both ships. - [ ] Merge `~zod`'s `%base` desk into its `%kids` desk to distribute the new code to the network: `|merge %kids our %base, =gem %only-that` - [ ] Before exiting the screen session on `~zod`, make sure the screen session is not left in copy mode for a long period of time, since that will disrupt `~zod`'s operation. From 032ee85b4fcf6723374e686acaaa32bfdb5e1317 Mon Sep 17 00:00:00 2001 From: Josh Lehman Date: Tue, 7 Feb 2023 10:27:11 -0800 Subject: [PATCH 3/6] Update MAINTAINERS.md --- MAINTAINERS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index d5f28ad85..9e04d4a29 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -143,7 +143,7 @@ git push origin - [ ] Merge `master` back into `develop`. - [ ] Cut a new release branch from `develop`. The branch should have the format `release/urbit-os-vX.XX` -### Post-Release Deployments +### Release Next Release Candidate We'll now need to deploy the new release candidate to the pre-release moons. From e44a661076fd248f600a3696dada00f8ba31a5fe Mon Sep 17 00:00:00 2001 From: Josh Lehman Date: Tue, 7 Feb 2023 10:35:43 -0800 Subject: [PATCH 4/6] Update MAINTAINERS.md --- MAINTAINERS.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 9e04d4a29..bedd9f666 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -126,7 +126,10 @@ git push origin - [ ] ssh into `~zod` - [ ] Check to ensure that nobody else is ssh'd into `~zod`, by running `screen -ls` and verifying no sessions are attached. - [ ] Attach to the screen session using `screen -x` -- [ ] Install the contents of the `%kids` desk on `~marnec-dozzod-marzod` into our `%base`: `|merge %base ~marnec-dozzod-marzod %kids, =gem %only-that` +- [ ] Ensure that the release candidate was correctly propagated through the prerelease moons + - Use `-read %z ~SHIP %DESK da+now /` to check desk hashes + - [ ] Run the above check on the following [SHIP DESK] pairs: [~marnec-dozzod-marzod %base], [~marnec-dozzod-marzod %kids], [~doznec-dozzod-marzod %base], [~doznec-dozzod-marzod %kids] — **they should all match** +- [ ] Install the contents of the `%kids` desk on `~doznec-dozzod-marzod` into our `%base`: `|merge %base ~doznec-dozzod-marzod %kids, =gem %only-that` - [ ] Check that `~zod` has updated to the latest release. For a Kelvin release, you can run `zuse` in the Dojo. Each non-Kelvin release might its own way of checking whether the update has completed, possibly through checking the `%cz` hash of the `%base` desk matches the hash on `~marnec-dozzod-marzod` by comparing the outputs of `+vat %base` on both ships. - [ ] Merge `~zod`'s `%base` desk into its `%kids` desk to distribute the new code to the network: `|merge %kids our %base, =gem %only-that` - [ ] Before exiting the screen session on `~zod`, make sure the screen session is not left in copy mode for a long period of time, since that will disrupt `~zod`'s operation. @@ -145,7 +148,7 @@ git push origin ### Release Next Release Candidate -We'll now need to deploy the new release candidate to the pre-release moons. +We'll now need to **IMMEDIATELY** deploy the new release candidate to the pre-release moons. - On `~marnec-dozzod-marzod`: - [ ] `|merge %base ~binnec-dozzod-marzod %kids, =gem %only-that` to update `~marnec` with the contents of the GH release branch From 1ecc010bacdbc980892d3c235f7ee1e97dab8652 Mon Sep 17 00:00:00 2001 From: Josh Lehman Date: Tue, 7 Feb 2023 10:42:29 -0800 Subject: [PATCH 5/6] Update MAINTAINERS.md --- MAINTAINERS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index bedd9f666..ebbe9e94e 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -148,7 +148,7 @@ git push origin ### Release Next Release Candidate -We'll now need to **IMMEDIATELY** deploy the new release candidate to the pre-release moons. +We'll now need to **IMMEDIATELY** deploy the new release candidate to the pre-release moon(s). - On `~marnec-dozzod-marzod`: - [ ] `|merge %base ~binnec-dozzod-marzod %kids, =gem %only-that` to update `~marnec` with the contents of the GH release branch From 23879acf0f65b11ae8f6cce9effd2b362f02d761 Mon Sep 17 00:00:00 2001 From: Josh Lehman Date: Fri, 10 Feb 2023 06:55:20 -0800 Subject: [PATCH 6/6] Update MAINTAINERS.md --- MAINTAINERS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index ebbe9e94e..40ecb6491 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -148,7 +148,7 @@ git push origin ### Release Next Release Candidate -We'll now need to **IMMEDIATELY** deploy the new release candidate to the pre-release moon(s). +We'll now need to **IMMEDIATELY** deploy the new release candidate to the pre-release moon(s). Otherwise PRs merged during this window will bypass the testing period on `~binnec` and go straight to the release candidate. - On `~marnec-dozzod-marzod`: - [ ] `|merge %base ~binnec-dozzod-marzod %kids, =gem %only-that` to update `~marnec` with the contents of the GH release branch