From 556b6ed32e4d9955f9410a3f9a2de51d1c960d9c Mon Sep 17 00:00:00 2001 From: Eric Rakestraw Date: Thu, 17 Sep 2026 14:19:57 +0000 Subject: [PATCH] Correct the pipeline subtree workflow --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 91cfcd6..75857ad 100644 --- a/README.md +++ b/README.md @@ -43,22 +43,24 @@ claim that version `0.1.0` has been published or tagged. [`ansible-role-dnd-pipeline`](https://gitea.maximumdirect.net/eric/ansible-role-dnd-pipeline) is authoritative. Make and review role changes there, then import the reviewed -commit; do not edit `roles/pipeline` directly. +commit; do not edit `roles/pipeline` directly. The selected commit or immutable +tag must be pushed to the authoritative repository before collection assembly. +Replace `PUSHED_COMMIT_OR_TAG` below with that remote revision. Initial import: ```sh -pipeline_commit=$(git -C ../ansible-role-dnd-pipeline rev-parse HEAD) +pipeline_revision=PUSHED_COMMIT_OR_TAG git subtree add --prefix=roles/pipeline \ https://gitea.maximumdirect.net/eric/ansible-role-dnd-pipeline.git \ - "$pipeline_commit" --squash + "$pipeline_revision" --squash ``` Subsequent update: ```sh -pipeline_commit=$(git -C ../ansible-role-dnd-pipeline rev-parse HEAD) +pipeline_revision=PUSHED_COMMIT_OR_TAG git subtree pull --prefix=roles/pipeline \ https://gitea.maximumdirect.net/eric/ansible-role-dnd-pipeline.git \ - "$pipeline_commit" --squash + "$pipeline_revision" --squash ```