Fix publish (#9)

* fix publish * fix * update
secretflow · Sep 26, 2024 · ee91bc6 · ee91bc6
1 parent eab7b0b
commit ee91bc6
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 76 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -34,69 +34,8 @@ parameters:
     type: string
     default: ""
 
-executors:
-  openjdk-executor-17:
-    docker:
-      - image: cimg/openjdk:17.0
 
 jobs:
-  build-and-push:
-    executor: openjdk-executor-17
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run:
-          name: Build Jar
-          command: make build
-      - run:
-          name: Push to Docker Hub
-          command: |
-            # login dataproxy dockerhub registry
-            docker login -u ${DOCKER_DEPLOY_USERNAME} -p ${DOCKER_DEPLOY_TOKEN}
-            # login dataproxy aliyun registry
-            docker login -u ${ALIYUN_DOCKER_USERNAME} -p ${ALIYUN_DOCKER_PASSWORD}  secretflow-registry.cn-hangzhou.cr.aliyuncs.com
-            CIRCLETAG=$(echo ${CIRCLE_TAG} | sed 's/v//')
-
-            BUILDER_EXISTS=$(
-              docker buildx inspect dataproxy_image_buildx >/dev/null 2>&1
-              echo $?
-            )
-
-            if [ "$BUILDER_EXISTS" -eq 0 ]; then
-              echo "existing buildx builder: dataproxy_image_buildx"
-              docker buildx use dataproxy_image_buildx
-            else
-              echo "creating new buildx builder: dataproxy_image_buildx"
-              docker buildx create --name dataproxy_image_buildx --use
-            fi
-
-            remote_image="secretflow-registry.cn-hangzhou.cr.aliyuncs.com/secretflow/dataproxy:latest"
-            docker buildx build \
-            --platform linux/arm64,linux/amd64 \
-            --tag "${remote_image}" \
-            -f ./build/Dockerfiles/dataproxy.Dockerfile . \
-            --push
-
-            remote_image="secretflow/dataproxy:latest"
-            docker buildx build \
-            --platform linux/arm64,linux/amd64 \
-            --tag "${remote_image}" \
-            -f ./build/Dockerfiles/dataproxy.Dockerfile . \
-            --push
-
-            remote_image="secretflow-registry.cn-hangzhou.cr.aliyuncs.com/secretflow/dataproxy:${CIRCLETAG}"
-            docker buildx build \
-            --platform linux/arm64,linux/amd64 \
-            --tag "${remote_image}" \
-            -f ./build/Dockerfiles/dataproxy.Dockerfile . \
-            --push
-
-            remote_image="secretflow/dataproxy:${CIRCLETAG}"
-            docker buildx build \
-            --platform linux/arm64,linux/amd64 \
-            --tag "${remote_image}" \
-            -f ./build/Dockerfiles/dataproxy.Dockerfile . \
-            --push
   lint:
     # Use machine executor for convenient data sharing between the host and docker-compose cluster
     docker:
@@ -117,7 +56,9 @@ workflows:
     when:
       equal: [ "release", << pipeline.parameters.GHA_Event >> ]
     jobs:
-      - build-and-push:
+      - continuation/continue:
+          configuration_path: .circleci/release-config.yml
+          # This is mandatory to trigger a pipeline when pushing a tag
           filters:
             tags:
               only: /^v.*/
@@ -137,13 +78,4 @@ workflows:
             .bazelrc sdk-build-and-run true
             WORKSPACE sdk-build-and-run true
       - lint
-  sdk-publish-workflow:
-    when:
-      equal: [ "release", << pipeline.parameters.GHA_Event >> ]
-    jobs:
-      - continuation/continue:
-          configuration_path: .circleci/release-config.yml
-          # This is mandatory to trigger a pipeline when pushing a tag
-          filters:
-            tags:
-              only: /^v.*/
+
diff --git a/.circleci/release-config.yml b/.circleci/release-config.yml
@@ -42,6 +42,9 @@ executors:
     macos:
       xcode: 15.1.0
     resource_class: macos.m1.large.gen1
+  openjdk-executor-17:
+    docker:
+      - image: cimg/openjdk:17.0
 
 commands:
   pip_publish:
@@ -66,7 +69,65 @@ commands:
 # Define a job to be invoked later in a workflow.
 # See: https://circleci.com/docs/2.0/configuration-reference/#jobs
 jobs:
-  linux_publish:
+  build-and-push:
+    executor: openjdk-executor-17
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run:
+          name: Build Jar
+          command: make build
+      - run:
+          name: Push to Docker Hub
+          command: |
+            # login dataproxy dockerhub registry
+            docker login -u ${DOCKER_DEPLOY_USERNAME} -p ${DOCKER_DEPLOY_TOKEN}
+            # login dataproxy aliyun registry
+            docker login -u ${ALIYUN_DOCKER_USERNAME} -p ${ALIYUN_DOCKER_PASSWORD}  secretflow-registry.cn-hangzhou.cr.aliyuncs.com
+            CIRCLETAG=$(echo ${CIRCLE_TAG} | sed 's/v//')
+
+            BUILDER_EXISTS=$(
+              docker buildx inspect dataproxy_image_buildx >/dev/null 2>&1
+              echo $?
+            )
+
+            if [ "$BUILDER_EXISTS" -eq 0 ]; then
+              echo "existing buildx builder: dataproxy_image_buildx"
+              docker buildx use dataproxy_image_buildx
+            else
+              echo "creating new buildx builder: dataproxy_image_buildx"
+              docker buildx create --name dataproxy_image_buildx --use
+            fi
+
+            remote_image="secretflow-registry.cn-hangzhou.cr.aliyuncs.com/secretflow/dataproxy:latest"
+            docker buildx build \
+            --platform linux/arm64,linux/amd64 \
+            --tag "${remote_image}" \
+            -f ./build/Dockerfiles/dataproxy.Dockerfile . \
+            --push
+
+            remote_image="secretflow/dataproxy:latest"
+            docker buildx build \
+            --platform linux/arm64,linux/amd64 \
+            --tag "${remote_image}" \
+            -f ./build/Dockerfiles/dataproxy.Dockerfile . \
+            --push
+
+            remote_image="secretflow-registry.cn-hangzhou.cr.aliyuncs.com/secretflow/dataproxy:${CIRCLETAG}"
+            docker buildx build \
+            --platform linux/arm64,linux/amd64 \
+            --tag "${remote_image}" \
+            -f ./build/Dockerfiles/dataproxy.Dockerfile . \
+            --push
+
+            remote_image="secretflow/dataproxy:${CIRCLETAG}"
+            docker buildx build \
+            --platform linux/arm64,linux/amd64 \
+            --tag "${remote_image}" \
+            -f ./build/Dockerfiles/dataproxy.Dockerfile . \
+            --push
+
+  linux_sdk_publish:
     parameters:
       python_ver:
         type: string
@@ -78,7 +139,7 @@ jobs:
       - pip_publish:
           python_ver: << parameters.python_ver >>
 
-  macOS_publish:
+  macOS_sdk_publish:
     parameters:
       python_ver:
         type: string
@@ -106,7 +167,7 @@ jobs:
 workflows:
   publish:
     jobs:
-      - linux_publish:
+      - linux_sdk_publish:
           matrix:
             parameters:
               python_ver: ["3.9", "3.10", "3.11"]
@@ -115,7 +176,7 @@ workflows:
           filters:
             tags:
               only: /^v.*/
-      - macOS_publish:
+      - macOS_sdk_publish:
           matrix:
             parameters:
               python_ver: ["3.9", "3.10", "3.11"]
@@ -124,3 +185,7 @@ workflows:
           filters:
             tags:
               only: /^v.*/
+      - build-and-push:
+          filters:
+            tags:
+              only: /^v.*/