From fd45b0b94465f783fffc758ddbe3b1cca79d2a2e Mon Sep 17 00:00:00 2001 From: guoliangye-okta Date: Thu, 24 Oct 2024 15:03:13 -0700 Subject: [PATCH] update --- Dockerfile.ci | 5 ++--- Makefile | 8 +++++++- Makefile.ci | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index ba24f4e0c7..9f7594c269 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -14,6 +14,5 @@ RUN if [ -d "vendor" ]; then \ else \ echo "Vendor directory does not exist"; \ fi - -RUN go mod download -RUN go mod tidy \ No newline at end of file +RUN go mod tidy +RUN go mod vendor \ No newline at end of file diff --git a/Makefile b/Makefile index 46a43678b4..ba14584175 100644 --- a/Makefile +++ b/Makefile @@ -71,4 +71,10 @@ updatedep: GOPRIVATE=${GOPRIVATE} go mod tidy GOPRIVATE=${GOPRIVATE} go get $(dep)@latest GOPRIVATE=${GOPRIVATE} go mod tidy - GOPRIVATE=${GOPRIVATE} go mod vendor \ No newline at end of file + GOPRIVATE=${GOPRIVATE} go mod vendor + + +update-go-deps: + export GOPRIVATE=github.com/atko-pam && \ + go mod tidy && \ + go mod vendor \ No newline at end of file diff --git a/Makefile.ci b/Makefile.ci index 211b8e5a86..5111f87856 100644 --- a/Makefile.ci +++ b/Makefile.ci @@ -60,6 +60,6 @@ ci-check-generate: ci-container -e TF_ACC_TERRAFORM_PATH \ -e TF_ACC_TERRAFORM_VERSION \ -v ${TF_ACC_TERRAFORM_PATH}:/usr/local/bin/terraform \ - -v "$(CURDIR)/build/ci-output:/output" `cat ./build/ci-output/container.txt` /usr/bin/make -C ${SRC_DIR} check-generate + -v "$(CURDIR)/build/ci-output:/output" `cat ./build/ci-output/container.txt` /usr/bin/make -C ${SRC_DIR} update-go-deps check-generate -.PHONY: all ci-compile ci-test ci-acceptance-test ci-check-generate +.PHONY: all ci-compile ci-test ci-acceptance-test ci-check-generate update-go-deps