Correct the pipeline subtree workflow
This commit is contained in:
12
README.md
12
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)
|
[`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
|
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:
|
Initial import:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
pipeline_commit=$(git -C ../ansible-role-dnd-pipeline rev-parse HEAD)
|
pipeline_revision=PUSHED_COMMIT_OR_TAG
|
||||||
git subtree add --prefix=roles/pipeline \
|
git subtree add --prefix=roles/pipeline \
|
||||||
https://gitea.maximumdirect.net/eric/ansible-role-dnd-pipeline.git \
|
https://gitea.maximumdirect.net/eric/ansible-role-dnd-pipeline.git \
|
||||||
"$pipeline_commit" --squash
|
"$pipeline_revision" --squash
|
||||||
```
|
```
|
||||||
|
|
||||||
Subsequent update:
|
Subsequent update:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
pipeline_commit=$(git -C ../ansible-role-dnd-pipeline rev-parse HEAD)
|
pipeline_revision=PUSHED_COMMIT_OR_TAG
|
||||||
git subtree pull --prefix=roles/pipeline \
|
git subtree pull --prefix=roles/pipeline \
|
||||||
https://gitea.maximumdirect.net/eric/ansible-role-dnd-pipeline.git \
|
https://gitea.maximumdirect.net/eric/ansible-role-dnd-pipeline.git \
|
||||||
"$pipeline_commit" --squash
|
"$pipeline_revision" --squash
|
||||||
```
|
```
|
||||||
|
|||||||
Reference in New Issue
Block a user