You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by gu...@apache.org on 2023/06/02 12:09:08 UTC

[spark-connect-go] branch master updated: [SPARK-43351][FOLLOW] Cleanup and Fix Makefile

This is an automated email from the ASF dual-hosted git repository.

gurwls223 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark-connect-go.git


The following commit(s) were added to refs/heads/master by this push:
     new 9b8c70d  [SPARK-43351][FOLLOW] Cleanup and Fix Makefile
9b8c70d is described below

commit 9b8c70dc949af440123de8f71302f6f8d0245253
Author: Martin Grund <ma...@databricks.com>
AuthorDate: Fri Jun 2 21:09:03 2023 +0900

    [SPARK-43351][FOLLOW] Cleanup and Fix Makefile
    
    ### What changes were proposed in this pull request?
    Follow-up patch to fix the Makefile and make sure all tests are executed during the Github action.
    
    ### Why are the changes needed?
    UT / Cleanup
    
    ### Does this PR introduce _any_ user-facing change?
    No
    
    ### How was this patch tested?
    UT
    
    Closes #7 from grundprinzip/SPARK-43351.
    
    Authored-by: Martin Grund <ma...@databricks.com>
    Signed-off-by: Hyukjin Kwon <gu...@apache.org>
---
 .github/workflows/build.yml |  2 +-
 .gitignore                  |  4 ++++
 Makefile                    | 17 +++++++++++------
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4b870fc..9d0c13b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -60,5 +60,5 @@ jobs:
           pwd
           go mod download -x
           make gen
-          make check
+          make
           make test
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index f61e556..17dc1fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,7 @@ coverage*
 
 # Ignore IDE files
 .idea/
+
+# Ignore binaries
+cmd/spark-connect-example-raw-grpc-client/spark-connect-example-raw-grpc-client
+cmd/spark-connect-example-spark-session/spark-connect-example-spark-session
\ No newline at end of file
diff --git a/Makefile b/Makefile
index a9829da..d4d158a 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ GOARCH                    ?= $(shell go version | cut -d' ' -f4 | cut -d'/' -f2)
 TAGS                      ?= netgo
 SHELL = bash
 
-BINARIES				  :=
+BINARIES				  := cmd/spark-connect-example-spark-session cmd/spark-connect-example-raw-grpc-client
 
 # Define the location of SPARK_HOME because we need that to depend on the build paths
 MAKEFILE_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
@@ -51,6 +51,16 @@ all: build
 
 build: $(BUILD_OUTPUT) $(BINARIES) internal/generated.out
 
+cmd/spark-connect-example-raw-grpc-client: $(GOFILES_BUILD)
+	@echo ">> BUILD, output = $@"
+	@cd $@ && $(GO) build -o $(notdir $@) $(BUILDFLAGS)
+	@printf '%s\n' '$(OK)'
+
+cmd/spark-connect-example-spark-session: $(GOFILES_BUILD)
+	@echo ">> BUILD, output = $@"
+	@cd $@ && $(GO) build -o $(notdir $@) $(BUILDFLAGS)
+	@printf '%s\n' '$(OK)'
+
 internal/generated.out:
 	@echo -n ">> BUILD, output = $@"
 	buf generate --debug -vvv
@@ -66,11 +76,6 @@ $(BUILD_OUTPUT): $(GOFILES_BUILD)
 	@$(GO) build -o $@ $(BUILDFLAGS)
 	@printf '%s\n' '$(OK)'
 
-check: $(ALLGOFILES) | gen
-	@echo -n ">> BUILD, output = $@"
-	@$(GO) build $(BUILDFLAGS) $^
-	@printf '%s\n' '$(OK)'
-
 lint: $(BUILD_OUTPUT)
 	@golangci-lint run
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org