From 09ab2a36bbb79104208d96951568111821bbcf45 Mon Sep 17 00:00:00 2001 From: Nick White Date: Mon, 6 Dec 2021 15:11:10 +0000 Subject: update pipeliner so that git pulls are merge-resolved with -Xtheirs rather than conflicts causing the service to not start --- roles/pipeliner/templates/updatepipeline.j2 | 4 ++-- 1 file 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/ -- cgit v1.2.1-24-ge1ad