diff options
| author | Nick White <git@njw.name> | 2021-12-06 15:11:10 +0000 |
|---|---|---|
| committer | Nick White <git@njw.name> | 2021-12-06 15:11:10 +0000 |
| commit | 09ab2a36bbb79104208d96951568111821bbcf45 (patch) | |
| tree | fd69c4faff96d52dab070bc7e51257b84bba3688 /roles/pipeliner/templates | |
| parent | 5632c4313f2990d6e24e05915737eb19062c3354 (diff) | |
update pipeliner so that git pulls are merge-resolved with -Xtheirs rather than conflicts causing the service to not start
Diffstat (limited to 'roles/pipeliner/templates')
| -rw-r--r-- | roles/pipeliner/templates/updatepipeline.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/pipeliner/templates/updatepipeline.j2 b/roles/pipeliner/templates/updatepipeline.j2 index 29acf34..87918c4 100644 --- a/roles/pipeliner/templates/updatepipeline.j2 +++ b/roles/pipeliner/templates/updatepipeline.j2 @@ -3,9 +3,9 @@ s="/home/{{ ansible_user }}/src" t="/home/{{ ansible_user }}/trainings" cd "$s/bookpipeline" && \ -git pull && \ +git pull -Xtheirs && \ /usr/local/go/bin/go install ./cmd/bookpipeline && \ sudo cp "$HOME/go/bin/bookpipeline" /usr/local/bin/ || exit 1 -cd "$t" && git pull && \ +cd "$t" && git pull -Xtheirs && \ sudo cp "$t"/* /usr/local/share/tesseract-ocr/tessdata/ |