Merge pull request #13 from eapolinario/monorepo--fix-boilerplate-ref…

…erences Pin golangcli-lint to v1.53.2
eapolinario · Aug 21, 2023 · b6a5214 · b6a5214
2 parents 96d0713 + 8489148
commit b6a5214
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 22 deletions.
diff --git a/boilerplate/flyte/golang_test_targets/Makefile b/boilerplate/flyte/golang_test_targets/Makefile
@@ -6,7 +6,7 @@
 
 .PHONY: download_tooling
 download_tooling: #download dependencies (including test deps) for the package
-	@boilerplate/flyte/golang_test_targets/download_tooling.sh
+	../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
@@ -16,22 +16,22 @@ set -e
 # List of tools to go get
 # In the format of "<cli>:<package>" or ":<package>" if no cli
 tools=(
-  "github.com/EngHabu/mockery/cmd/mockery"
-  "github.com/flyteorg/flytestdlib/cli/pflags@latest"
-  "github.com/golangci/golangci-lint/cmd/golangci-lint@latest"
-  "github.com/alvaroloes/enumer"
-  "github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc"
+	"github.com/EngHabu/mockery/cmd/mockery"
+	"github.com/flyteorg/flytestdlib/cli/pflags@latest"
+	# Pin to this version while investigating failure
+	"github.com/golangci/golangci-lint/cmd/[email protected]"
+	"github.com/alvaroloes/enumer"
+	"github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc"
 )
 
 tmp_dir=$(mktemp -d -t gotooling-XXX)
 echo "Using temp directory ${tmp_dir}"
-cp -R boilerplate/flyte/golang_support_tools/* $tmp_dir
+cp -R ../boilerplate/flyte/golang_support_tools/* $tmp_dir
 pushd "$tmp_dir"
 
-for tool in "${tools[@]}"
-do
-    echo "Installing ${tool}"
-    GO111MODULE=on go install $tool
+for tool in "${tools[@]}"; do
+	echo "Installing ${tool}"
+	GO111MODULE=on go install $tool
 done
 
 popd
diff --git a/datacatalog/Makefile b/datacatalog/Makefile
@@ -1,6 +1,6 @@
 export REPOSITORY=datacatalog
-include boilerplate/flyte/docker_build/Makefile
-include boilerplate/flyte/golang_test_targets/Makefile
+include ../boilerplate/flyte/docker_build/Makefile
+include ../boilerplate/flyte/golang_test_targets/Makefile
 
 .PHONY: update_boilerplate
 update_boilerplate:

diff --git a/flyteadmin/Makefile b/flyteadmin/Makefile
@@ -1,8 +1,8 @@
 export REPOSITORY=flyteadmin
 export FLYTE_SCHEDULER_REPOSITORY=flytescheduler
-include boilerplate/flyte/docker_build/Makefile
-include boilerplate/flyte/golang_test_targets/Makefile
-include boilerplate/flyte/end2end/Makefile
+include ../boilerplate/flyte/docker_build/Makefile
+include ../boilerplate/flyte/golang_test_targets/Makefile
+include ../boilerplate/flyte/end2end/Makefile
 
 GIT_VERSION := $(shell git describe --always --tags)
 GIT_HASH := $(shell git rev-parse --short HEAD)

diff --git a/flyteplugins/Makefile b/flyteplugins/Makefile
@@ -1,6 +1,6 @@
 export REPOSITORY=flyteplugins
-include boilerplate/flyte/docker_build/Makefile
-include boilerplate/flyte/golang_test_targets/Makefile
+include ../boilerplate/flyte/docker_build/Makefile
+include ../boilerplate/flyte/golang_test_targets/Makefile
 
 .PHONY: update_boilerplate
 update_boilerplate:

diff --git a/flytepropeller/Makefile b/flytepropeller/Makefile
@@ -1,7 +1,7 @@
 export REPOSITORY=flytepropeller
-include boilerplate/flyte/docker_build/Makefile
-include boilerplate/flyte/golang_test_targets/Makefile
-include boilerplate/flyte/end2end/Makefile
+include ../boilerplate/flyte/docker_build/Makefile
+include ../boilerplate/flyte/golang_test_targets/Makefile
+include ../boilerplate/flyte/end2end/Makefile
 
 .PHONY: update_boilerplate
 update_boilerplate:

diff --git a/flytestdlib/Makefile b/flytestdlib/Makefile
@@ -1,5 +1,5 @@
 export REPOSITORY=flytestdlib
-include boilerplate/flyte/golang_test_targets/Makefile
+include ../boilerplate/flyte/golang_test_targets/Makefile
 
 .PHONY: update_boilerplate
 update_boilerplate: