Fix make generate and run it

Signed-off-by: Haytham Abuelfutuh <[email protected]>
flyteorg · Jul 4, 2024 · ddc3fe0 · ddc3fe0
1 parent 76005db
commit ddc3fe0
Show file tree

Hide file tree

Showing 14 changed files with 90 additions and 585 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,5 @@
 export REPOSITORY=flyte
+export REPO_ROOT := $(shell pwd)
 include boilerplate/flyte/end2end/Makefile
 include boilerplate/flyte/golang_test_targets/Makefile
 
@@ -136,8 +137,8 @@ go-tidy:
 	make -C flytestdlib go-tidy
 	make -C flytecopilot go-tidy
 
-.PHONY: gen
-gen:
+.PHONY: generate
+generate:
 	make -C flyteidl generate
 	make -C flyteadmin generate
 	make -C flytepropeller generate

diff --git a/boilerplate/flyte/golang_test_targets/Makefile b/boilerplate/flyte/golang_test_targets/Makefile
@@ -4,10 +4,11 @@
 # TO OPT OUT OF UPDATES, SEE https://github.com/flyteorg/boilerplate/blob/master/Readme.rst
 
 LINT_FLAGS ?=
+export REPO_ROOT ?= $(shell pwd)
 
 .PHONY: download_tooling
 download_tooling: #download dependencies (including test deps) for the package
-	@../boilerplate/flyte/golang_test_targets/download_tooling.sh
+	@${REPO_ROOT}/boilerplate/flyte/golang_test_targets/download_tooling.sh
 
 .PHONY: generate
 generate: download_tooling #generate go code

diff --git a/boilerplate/flyte/golang_test_targets/download_tooling.sh b/boilerplate/flyte/golang_test_targets/download_tooling.sh
@@ -30,7 +30,7 @@ cp $REPO_ROOT/flytestdlib/bin/pflags $(go env GOPATH)/bin
 
 tmp_dir=$(mktemp -d -t gotooling-XXX)
 echo "Using temp directory ${tmp_dir}"
-cp -R ../boilerplate/flyte/golang_support_tools/* $tmp_dir
+cp -R $REPO_ROOT/boilerplate/flyte/golang_support_tools/* $tmp_dir
 pushd "$tmp_dir"
 
 for tool in "${tools[@]}"; do

diff --git a/datacatalog/Makefile b/datacatalog/Makefile
@@ -1,5 +1,5 @@
 export REPOSITORY=datacatalog
-export REPO_ROOT=..
+export REPO_ROOT ?= $(shell pwd)/../
 include ../boilerplate/flyte/docker_build/Makefile
 include ../boilerplate/flyte/golang_test_targets/Makefile
 

diff --git a/flyteadmin/Makefile b/flyteadmin/Makefile
@@ -1,6 +1,6 @@
 export REPOSITORY=flyteadmin
 export FLYTE_SCHEDULER_REPOSITORY=flytescheduler
-export REPO_ROOT=..
+export REPO_ROOT ?= $(shell pwd)/../
 include ../boilerplate/flyte/docker_build/Makefile
 include ../boilerplate/flyte/golang_test_targets/Makefile
 include ../boilerplate/flyte/end2end/Makefile

diff --git a/flytecopilot/Makefile b/flytecopilot/Makefile
@@ -1,5 +1,5 @@
 export REPOSITORY=flytecopilot
-export REPO_ROOT=..
+export REPO_ROOT ?= $(shell pwd)/../
 include ../boilerplate/flyte/docker_build/Makefile
 include ../boilerplate/flyte/golang_test_targets/Makefile
 

diff --git a/flytectl/Makefile b/flytectl/Makefile
@@ -1,5 +1,5 @@
 export REPOSITORY=flytectl
-export REPO_ROOT=..
+export REPO_ROOT ?= $(shell pwd)/../
 include ../boilerplate/flyte/docker_build/Makefile
 include ../boilerplate/flyte/golang_test_targets/Makefile
 include ../boilerplate/flyte/end2end/Makefile

diff --git a/flyteidl/Makefile b/flyteidl/Makefile
@@ -1,5 +1,5 @@
 export REPOSITORY=flyteidl
-export REPO_ROOT=..
+export REPO_ROOT ?= $(shell pwd)/../
 include ../boilerplate/flyte/golang_test_targets/Makefile
 
 define PIP_COMPILE