From 1cbd96185a5b846b6f6f9ce5a1222c3e4d8e8606 Mon Sep 17 00:00:00 2001 From: hlts2 Date: Mon, 8 Apr 2024 12:20:18 +0900 Subject: [PATCH] fix: update makefile Signed-off-by: hlts2 --- .github/workflows/Makefile | 17 ----------------- Makefile | 17 ++++++++++++++++- 2 files changed, 16 insertions(+), 18 deletions(-) delete mode 100644 .github/workflows/Makefile diff --git a/.github/workflows/Makefile b/.github/workflows/Makefile deleted file mode 100644 index dffccc12..00000000 --- a/.github/workflows/Makefile +++ /dev/null @@ -1,17 +0,0 @@ - -REPO ?= vdaas -NAME = vald -VALD_DIR = vald-origin -VALDREPO = github.com/$(REPO)/$(NAME) -VALD_CHECKOUT_TARGET_NAME ?= main - -$(VALD_DIR): - git clone https://$(VALDREPO) $(VALD_DIR) - -vald/clone: $(VALD_DIR) - -vald/checkout: $(VALD_DIR) - cd $(VALD_DIR) && git checkout ${VALD_CHECKOUT_TARGET_NAME} - -vald/origin/sha/print: $(VALD_DIR) - @cd $(VALD_DIR) && git rev-parse HEAD | tr -d '\n' diff --git a/Makefile b/Makefile index 28e20695..68dfac0d 100755 --- a/Makefile +++ b/Makefile @@ -112,7 +112,21 @@ $(PB2DIR_ROOT): $(PB2PYS): proto/deps $(PB2DIR_ROOT) $(SHADOWS) $(VALD_DIR): - git clone --depth 1 https://$(VALDREPO) $(VALD_DIR) + git clone https://$(VALDREPO) $(VALD_DIR) + +.PHONY: vald/clone +## clone vald repository +vald/clone: $(VALD_DIR) + +.PHONY: vald/checkout +## checkout vald repository +vald/checkout: $(VALD_DIR) + cd $(VALD_DIR) && git checkout ${VALD_CHECKOUT_TARGET_NAME} + +.PHONY: vald/origin/sha/print +## print origin VALD_SHA value +vald/origin/sha/print: $(VALD_DIR) + @cd $(VALD_DIR) && git rev-parse HEAD | tr -d '\n' .PHONY: vald/sha/print ## print VALD_SHA value @@ -166,3 +180,4 @@ $(BINDIR)/buf: "https://github.com/bufbuild/buf/releases/download/$$version/buf-$(shell uname -s)-$(shell uname -m)" \ -o "${BINDIR}/buf" && \ chmod +x "${BINDIR}/buf" +