Merge PR #13: docs(ship): AGit PRs merged by hand stay open; deploy host override
CI / Backend tests (Maven / Java 21) (push) Successful in 44s
CI / Backend tests (Maven / Java 21) (push) Successful in 44s
This commit is contained in:
commit
0a5d961113
1 file changed
+4
-3
@@ -21,9 +21,10 @@ Repo rules: `CONTRIBUTING.md`. Gitea: https://git.mariuszpacek.pl/mariusz.pacek/
|
||||
On `failure`, read the run under `…/actions`, fix, push again. Never merge red.
|
||||
5. Merge only if the user asked for it in this task:
|
||||
`git switch master && git pull --ff-only && git merge --no-ff <branch> -m "Merge PR #N: <title>"`,
|
||||
then `git push origin master` (Gitea marks the PR merged) and delete the branch locally
|
||||
and on origin. Confirm CI is green on master.
|
||||
then `git push origin master` and delete the branch locally and on origin. Confirm CI is
|
||||
green on master. Gitea does not close an AGit PR merged by hand: ask the user to close it.
|
||||
6. Deploy only with the user's explicit approval for this deploy, and only for changes that
|
||||
touch the gateway: `scripts/deploy-gateway.sh vMAJOR.MINOR.PATCH` (patch for fixes, minor
|
||||
for features). Then watch `ssh pi@raspberrypi.local journalctl -u home-pump.service -f`
|
||||
for features; `PI=<ssh host>` while D7 is open). Then watch
|
||||
`ssh <host> journalctl -u home-pump.service -f`
|
||||
and Grafana for one polling cycle (300 s) and report what you saw.
|
||||
Reference in new issue
Block a user