From 93d39603a1c593040b7b5ba55d85e0fc3d376b9a Mon Sep 17 00:00:00 2001 From: eholgu401 Date: Tue, 8 Nov 2022 11:49:27 -0700 Subject: [PATCH 1/3] Add go mod vendor to t3c run.sh --- dev/t3c/run.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev/t3c/run.sh b/dev/t3c/run.sh index 9f1c2e36c6..4f627c4005 100755 --- a/dev/t3c/run.sh +++ b/dev/t3c/run.sh @@ -20,6 +20,9 @@ set -o errexit trap '[ $? -eq 0 ] && exit 0 || echo "Error on line ${LINENO} of ${0}"; exit 1' EXIT +cd $TC +go mod vendor + cd "$TC/tc-health-client" go build --gcflags "all=-N -l" . From 6d7774d65701f94b9d0bd65d423f6488404d34c9 Mon Sep 17 00:00:00 2001 From: eholgu401 Date: Thu, 10 Nov 2022 09:09:07 -0700 Subject: [PATCH 2/3] run go mod vendor when golang dir doesnt exist --- dev/atc.dev.sh | 8 +++++++- dev/t3c/run.sh | 3 --- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dev/atc.dev.sh b/dev/atc.dev.sh index 9d3a819c87..81debdcc1f 100644 --- a/dev/atc.dev.sh +++ b/dev/atc.dev.sh @@ -15,10 +15,16 @@ # specific language governing permissions and limitations # under the License. -alias atc-start="docker-compose up -d --build"; alias atc-build="docker-compose build"; alias atc-stop="docker-compose kill && docker-compose down -v --remove-orphans"; +function atc-start { + if [ ! -d "vendor/golang/x" ]; then + go mod vendor + fi + docker-compose up -d --build +} + function atc-restart { if ! atc-stop $@; then return 1; diff --git a/dev/t3c/run.sh b/dev/t3c/run.sh index 4f627c4005..9f1c2e36c6 100755 --- a/dev/t3c/run.sh +++ b/dev/t3c/run.sh @@ -20,9 +20,6 @@ set -o errexit trap '[ $? -eq 0 ] && exit 0 || echo "Error on line ${LINENO} of ${0}"; exit 1' EXIT -cd $TC -go mod vendor - cd "$TC/tc-health-client" go build --gcflags "all=-N -l" . From e89adb96548a8463f463021c9a26da4186e9aaeb Mon Sep 17 00:00:00 2001 From: eholgu401 Date: Thu, 10 Nov 2022 15:32:00 -0700 Subject: [PATCH 3/3] fix directory name --- dev/atc.dev.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/atc.dev.sh b/dev/atc.dev.sh index 81debdcc1f..7bf0a92923 100644 --- a/dev/atc.dev.sh +++ b/dev/atc.dev.sh @@ -19,7 +19,7 @@ alias atc-build="docker-compose build"; alias atc-stop="docker-compose kill && docker-compose down -v --remove-orphans"; function atc-start { - if [ ! -d "vendor/golang/x" ]; then + if [ ! -d "vendor/golang.org/x" ]; then go mod vendor fi docker-compose up -d --build