From a0c2661bc4764a74ff8737744b0d47fac4c1a5e9 Mon Sep 17 00:00:00 2001
From: Han Xiao <han.xiao@jina.ai>
Date: Mon, 20 Jun 2022 13:18:47 +0200
Subject: [PATCH] chore: fix tag docker build job

---
 .github/workflows/force-hub-push.yml |  6 ++---
 .github/workflows/force-release.yml  | 33 ----------------------------
 .github/workflows/tag.yml            | 29 ++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/force-hub-push.yml b/.github/workflows/force-hub-push.yml
index ad3bfec99..c1dc5a263 100644
--- a/.github/workflows/force-hub-push.yml
+++ b/.github/workflows/force-hub-push.yml
@@ -104,7 +104,7 @@ jobs:
           
           echo -e "\
           manifest_version: 1\n\
-          name: CLIPTorchEncoder\n\
+          name: CASTorch\n\
           description: Embed images and sentences into fixed-length vectors with CLIP\n\
           url: https://github.com/jina-ai/clip-as-service\n\
           keywords: [clip, clip-model, clip-as-service, pytorch]\n\
@@ -141,7 +141,7 @@ jobs:
           
           echo -e "\
           manifest_version: 1\n\
-          name: CLIPOnnxEncoder\n\
+          name: CASOnnx\n\
           description: Embed images and sentences into fixed-length vectors with CLIP\n\
           url: https://github.com/jina-ai/clip-as-service\n\
           keywords: [clip, clip-model, clip-as-service, onnx, onnx-runtime]\n\
@@ -180,7 +180,7 @@ jobs:
           
           echo -e "\
           manifest_version: 1\n\
-          name: CLIPTensorRTEncoder\n\
+          name: CASTensorrt\n\
           description: Embed images and sentences into fixed-length vectors with CLIP\n\
           url: https://github.com/jina-ai/clip-as-service\n\
           keywords: [clip, clip-model, clip-as-service, onnx, tensorrt]\n\
diff --git a/.github/workflows/force-release.yml b/.github/workflows/force-release.yml
index 69b7af77a..5063cf091 100644
--- a/.github/workflows/force-release.yml
+++ b/.github/workflows/force-release.yml
@@ -47,36 +47,3 @@ jobs:
           github_token: ${{ secrets.JINA_DEV_BOT }}
           tags: true
           branch: main
-
-  docker-release:
-    needs: token-check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: benc-uk/workflow-dispatch@v1
-        with:
-          workflow: Manual CAS Docker Build
-          inputs: '{ "release_token": "${{ env.release_token }}", "triggered_by": "CD"}'
-          token: ${{ secrets.JINA_DEV_BOT }}
-        env:
-          release_token: ${{ secrets.CAS_RELEASE_TOKEN }}
-      - name: Build and push docker
-        uses: benc-uk/workflow-dispatch@v1
-        with:
-          workflow: Manual Docker Build
-          inputs: '{ "release_token": "${{ env.release_token }}", "triggered_by": "MANUAL"}'
-          token: ${{ secrets.JINA_DEV_BOT }}
-        env:
-          release_token: ${{ secrets.CAS_RELEASE_TOKEN }}
-
-  hub-release:
-    needs: token-check
-    runs-on: ubuntu-latest
-    steps:
-      - name: upload executors to hub
-        uses: benc-uk/workflow-dispatch@v1
-        with:
-          workflow: Manual Hub Push
-          inputs: '{ "release_token": "${{ env.release_token }}", "triggered_by": "MANUAL"}'
-          token: ${{ secrets.JINA_DEV_BOT }}
-        env:
-          release_token: ${{ secrets.CAS_RELEASE_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
index 981e0b58c..89cf04f25 100644
--- a/.github/workflows/tag.yml
+++ b/.github/workflows/tag.yml
@@ -17,6 +17,35 @@ jobs:
         env:
           release_token: ${{ secrets.CAS_RELEASE_TOKEN }}
 
+  update-docker:
+    needs: update-doc
+    runs-on: ubuntu-latest
+    steps:
+      - name: CAS Docker Build
+        uses: benc-uk/workflow-dispatch@v1
+        with:
+          workflow: Manual CAS Docker Build
+          inputs: '{ "release_token": "${{ env.release_token }}", "triggered_by": "TAG"}'
+          token: ${{ secrets.JINA_DEV_BOT }}
+        env:
+          release_token: ${{ secrets.CAS_RELEASE_TOKEN }}
+      - name: Helm Executor Build
+        uses: benc-uk/workflow-dispatch@v1
+        with:
+          workflow: Manual Docker Build
+          inputs: '{ "release_token": "${{ env.release_token }}", "triggered_by": "TAG"}'
+          token: ${{ secrets.JINA_DEV_BOT }}
+        env:
+          release_token: ${{ secrets.CAS_RELEASE_TOKEN }}
+      - name: Hub Executor Build
+        uses: benc-uk/workflow-dispatch@v1
+        with:
+          workflow: Manual Hub Push
+          inputs: '{ "release_token": "${{ env.release_token }}", "triggered_by": "TAG"}'
+          token: ${{ secrets.JINA_DEV_BOT }}
+        env:
+          release_token: ${{ secrets.CAS_RELEASE_TOKEN }}
+
   create-release:
     needs: update-doc
     runs-on: ubuntu-latest