update command link and Makefile (#568)

* update command link
* workflow install make on mac amd64

.github/workflows/main.yml

@@ -45,12 +45,7 @@ jobs:
     - name: bazel build
       run: |
         # cc_binary
-        bazel build --config=linux_`arch` //:node \
-            //:py_main \
-            //:py_main \
-            //:cli \
-            //src/primihub/pybind_warpper:opt_paillier_c2py \
-            //src/primihub/pybind_warpper:linkcontext
+        make
 
   build-on-ubuntu-arm64:
     runs-on: [self-hosted, Linux, ARM64]
@@ -60,11 +55,7 @@ jobs:
       run: |
         # cc_binary
         bash pre_build.sh
-        bazel build --config=linux_`arch` //:node \
-            //:py_main \
-            //:cli \
-            //src/primihub/pybind_warpper:linkcontext \
-            //src/primihub/pybind_warpper:opt_paillier_c2py
+        make
 
 
   build-on-mac-amd64:
@@ -76,6 +67,8 @@ jobs:
     - name: set PYTHON LINK_OPTS
       run: ./pre_build.sh
       shell: bash
+    - name: Install make
+      run: brew install make
     - name: bazel test
       run: |
         mv -f WORKSPACE_GITHUB WORKSPACE
@@ -95,9 +88,5 @@ jobs:
     - name: bazel build
       run: |
         # cc_binary
-        bazel build --config=darwin_x86_64 //:node \
-            //:py_main \
-            //:cli \
-            //src/primihub/pybind_warpper:opt_paillier_c2py \
-            //src/primihub/pybind_warpper:linkcontext
+        make
 

.github/workflows/release.yaml

@@ -17,13 +17,8 @@ jobs:
         run: |
           # cc_binary
           bash pre_build.sh
-          bazel build --config=linux_`arch` --define enable_mysql_driver=true //:node \
-            //:py_main \
-            //:cli \
-            //src/primihub/pybind_warpper:opt_paillier_c2py \
-            //src/primihub/protos:worker_py_pb2_grpc \
-            //src/primihub/protos:service_py_pb2_grpc \
-            //src/primihub/pybind_warpper:linkcontext
+          make mysql=y protos=y
+
           #copy generated py pb to python dir
           cp -f bazel-bin/src/primihub/pybind_warpper/linkcontext.so python
           cp -f bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so python
@@ -32,6 +27,8 @@ jobs:
 
           tar zcf primihub-linux-amd64.tar.gz bazel-bin/cli \
              bazel-bin/node \
+             primihub-cli \
+             primihub-node \
              bazel-bin/py_main \
              bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so \
              bazel-bin/src/primihub/pybind_warpper/linkcontext.so \
@@ -64,14 +61,8 @@ jobs:
         run: |
           # cc_binary
           bash pre_build.sh
-          bazel build --config=linux_`arch` //:node \
-            //:py_main \
-            //:cli \
-            //src/primihub/pybind_warpper:opt_paillier_c2py \
-            //src/primihub/pybind_warpper:linkcontext \
-            //src/primihub/protos:worker_py_pb2_grpc \
-            //src/primihub/protos:service_py_pb2_grpc
-
+          make protos=y
+          
           cp -f bazel-bin/src/primihub/pybind_warpper/linkcontext.so python
           cp -f bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so python
           cp -f bazel-bin/src/primihub/protos/*.py \
@@ -79,6 +70,8 @@ jobs:
 
           tar zcf primihub-linux-arm64.tar.gz bazel-bin/cli \
              bazel-bin/node \
+             primihub-cli \
+             primihub-node \
              bazel-bin/py_main \
              bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so \
              bazel-bin/src/primihub/pybind_warpper/linkcontext.so \
@@ -109,6 +102,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup bazelisk
         uses: bazelbuild/setup-bazelisk@v2
+      - name: Install make
+        run: brew install make
       - name: set PYTHON LINK_OPTS
         run: ./pre_build.sh
         shell: bash
@@ -116,14 +111,7 @@ jobs:
       - name: bazel build
         run: |
           # cc_binary
-          bazel build --config=darwin_x86_64  //:node \
-            //:py_main \
-            //:cli \
-            //src/primihub/pybind_warpper:opt_paillier_c2py \
-            //src/primihub/pybind_warpper:linkcontext
-            # fix in future
-            #//src/primihub/protos:worker_py_pb2_grpc \
-            #//src/primihub/protos:service_py_pb2_grpc
+          make
 
           cp -f bazel-bin/src/primihub/pybind_warpper/linkcontext.so python
           cp -f bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so python
@@ -132,6 +120,8 @@ jobs:
 
           tar zcf primihub-darwin-amd64.tar.gz bazel-bin/cli \
             bazel-bin/node \
+            primihub-cli \
+            primihub-node \
             bazel-bin/py_main \
             bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so \
             bazel-bin/src/primihub/pybind_warpper/linkcontext.so \
@@ -158,13 +148,7 @@ jobs:
         run: |
           # cc_binary
           bash pre_build.sh
-          bazel build --config=darwin_arm64 //:node \
-              //:py_main \
-              //:cli \
-              //src/primihub/pybind_warpper:opt_paillier_c2py \
-              //src/primihub/pybind_warpper:linkcontext \
-              //src/primihub/protos:worker_py_pb2_grpc \
-              //src/primihub/protos:service_py_pb2_grpc
+          make protos=y
 
           cp -f bazel-bin/src/primihub/pybind_warpper/linkcontext.so python
           cp -f bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so python
@@ -173,6 +157,8 @@ jobs:
 
           tar zcf primihub-darwin-arm64.tar.gz bazel-bin/cli \
               bazel-bin/node \
+              primihub-cli \
+              primihub-node \
               bazel-bin/py_main \
               bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so \
               bazel-bin/src/primihub/pybind_warpper/linkcontext.so \

Dockerfile

@@ -33,13 +33,11 @@ ADD . /src
 # Bazel build primihub-node & primihub-cli & paillier shared library
 RUN bash pre_build.sh \
   && mv -f WORKSPACE_GITHUB WORKSPACE \
-  && bazel build --config=linux_`arch` //:node \
-    //:py_main \
-    //:cli \
-    //src/primihub/pybind_warpper:opt_paillier_c2py \
-    //src/primihub/pybind_warpper::linkcontext \
+  && make mysql=y \
   && tar zcf bazel-bin.tar.gz bazel-bin/cli \
              bazel-bin/node \
+             primihub-cli \
+             primihub-node \
              bazel-bin/py_main \
              bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so \
              bazel-bin/src/primihub/pybind_warpper/linkcontext.so \
@@ -64,9 +62,7 @@ WORKDIR /app
 
 # Copy opt_paillier_c2py.so linkcontext.so to /app/python, this enable setup.py find it.
 RUN tar zxf /opt/bazel-bin.tar.gz \
-  && mkdir log \
-  && ln -s bazel-bin/node primihub-node \
-  && ln -s bazel-bin/cli primihub-cli
+  && mkdir log
 
 WORKDIR /app/python
 

Dockerfile.local

@@ -5,12 +5,9 @@ WORKDIR /app
 
 ADD bazel-bin.tar.gz ./
 COPY src/primihub/protos/ src/primihub/protos/
-# Make symlink to primihub-node & primihub-cli
-RUN mkdir log \
-  && ln -s bazel-bin/node primihub-node \
-  && ln -s bazel-bin/cli primihub-cli
 
-RUN cd python \
+RUN mkdir log \
+  && cd python \
   && python3 setup.py develop
 
 EXPOSE 50050

Dockerfile.release

@@ -14,9 +14,7 @@ COPY primihub-linux-amd64.tar.gz primihub-linux-arm64.tar.gz /opt/
 COPY src/primihub/protos/ src/primihub/protos/
 
 RUN tar zxf /opt/primihub-linux-$(dpkg --print-architecture).tar.gz \
-  && mkdir log \
-  && ln -s bazel-bin/node primihub-node \
-  && ln -s bazel-bin/cli primihub-cli
+  && mkdir log
 
 WORKDIR /app/python
 

Makefile

+BUILD_FLAG ?= 
 
 TARGET := //:node \
-         //:cli \
-         //src/primihub/cli:reg_cli \
-         //src/primihub/pybind_warpper:linkcontext \
-         //src/primihub/pybind_warpper:opt_paillier_c2py \
-         //:py_main
+          //:cli \
+          //src/primihub/cli:reg_cli \
+          //src/primihub/pybind_warpper:linkcontext \
+          //src/primihub/pybind_warpper:opt_paillier_c2py \
+          //:py_main
+
+ifeq ($(mysql), y)
+    BUILD_FLAG += --define enable_mysql_driver=true
+endif
+
+ifeq ($(protos), y)
+    TARGET += //src/primihub/protos:worker_py_pb2_grpc //src/primihub/protos:service_py_pb2_grpc
+endif
 
 release:
-	bazel build --config=PLATFORM_HARDWARE ${TARGET}
+	bazel build --config=PLATFORM_HARDWARE $(BUILD_FLAG) ${TARGET}
+	ln -s bazel-bin/cli primihub-cli
+	ln -s bazel-bin/node primihub-node
 
 #linux_x86_64:
 #	bazel build --config=linux_x86_64 ${TARGET}

build_local.sh

@@ -15,13 +15,7 @@ fi
 
 bash pre_build.sh
 
-ARCH=`arch`
-
-bazel build --config=linux_$ARCH --define enable_mysql_driver=true //:node \
-    //:py_main \
-    //:cli \
-    //src/primihub/pybind_warpper:opt_paillier_c2py \
-    //src/primihub/pybind_warpper:linkcontext
+make mysql=y
 
 if [ $? -ne 0 ]; then
     echo "Build failed!!!"
@@ -33,6 +27,8 @@ git rev-parse HEAD >> commit.txt
 
 tar zcf bazel-bin.tar.gz bazel-bin/cli \
         bazel-bin/node \
+        primihub-cli \
+        primihub-node \
         bazel-bin/py_main \
         bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so \
         bazel-bin/src/primihub/pybind_warpper/linkcontext.so \