From b52c3224b1b18bf3965e260942622605cf493a22 Mon Sep 17 00:00:00 2001 From: Nick White Date: Mon, 19 Oct 2020 12:39:40 +0100 Subject: Stop using GOPATH for source code to ensure go modules are enabled Source code in GOPATH disables modules mode when GO111MODULES=auto, which is the default. Keeping it out should make things reliable here. Note that this is not yet tested. --- roles/pipeliner/templates/updatepipeline.j2 | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'roles/pipeliner/templates') diff --git a/roles/pipeliner/templates/updatepipeline.j2 b/roles/pipeliner/templates/updatepipeline.j2 index 5b76f9a..efe04e1 100644 --- a/roles/pipeliner/templates/updatepipeline.j2 +++ b/roles/pipeliner/templates/updatepipeline.j2 @@ -1,14 +1,11 @@ #!/bin/sh -g="/home/{{ ansible_user }}/src/go" +s="/home/{{ ansible_user }}/src" t="/home/{{ ansible_user }}/trainings" -# The extra go install step ensures that go modules are used -# (they don't work for the go get stage in go 1.11) -export GOPATH="$g" -cd "$g/src/rescribe.xyz/bookpipeline" && \ +cd "$s/bookpipeline" && \ git pull && \ -GO111MODULE=on go install ./... && \ -sudo cp "$g/bin/bookpipeline" /usr/local/bin/ || exit 1 +go install ./... && \ +sudo cp "$HOME/go/bin/bookpipeline" /usr/local/bin/ || exit 1 cd "$t" && git pull && \ sudo cp "$t"/* /usr/local/share/tesseract-ocr/tessdata/ -- cgit v1.2.1-24-ge1ad