From 8195511b09ffb6023b2a987c14588d1153ef2b20 Mon Sep 17 00:00:00 2001
From: chenos <chenlinxh@gmail.com>
Date: Wed, 20 Nov 2024 21:04:29 +0800
Subject: [PATCH] chore: update build ci

---
 .github/workflows/manual-build-pro-image.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/manual-build-pro-image.yml b/.github/workflows/manual-build-pro-image.yml
index 90ec8e547..aeec9b19a 100644
--- a/.github/workflows/manual-build-pro-image.yml
+++ b/.github/workflows/manual-build-pro-image.yml
@@ -109,14 +109,16 @@ jobs:
         id: get-tag
         run: |
           if [ "${{ inputs.pr_number }}" != "" ]; then
-            echo "tag=pr-${{ inputs.pr_number }}" >> "$GITHUB_OUTPUT"
+            echo "tag=pr-${{ inputs.pr_number }}-pro" >> "$GITHUB_OUTPUT"
+          elif [ "${{ inputs.nocobase_pr_number }}" != "" ]; then
+            echo "tag=pr-${{ inputs.nocobase_pr_number }}" >> "$GITHUB_OUTPUT"
           else
             echo "tag=${{ github.head_ref || github.ref_name }}" >> "$GITHUB_OUTPUT"
           fi
       - name: Set tags
         id: set-tags
         run: |
-          echo "::set-output name=tags::${{ secrets.ALI_DOCKER_REGISTRY }}/nocobase/nocobase:${{ steps.get-tag.outputs.tag }}-pro"
+          echo "::set-output name=tags::${{ secrets.ALI_DOCKER_REGISTRY }}/nocobase/nocobase:${{ steps.get-tag.outputs.tag }}"
       - name: Set variables
         run: |
           target_directory="./packages/pro-plugins/@nocobase"
@@ -129,7 +131,7 @@ jobs:
           echo "var1=$BEFORE_PACK_NOCOBASE" >> $GITHUB_OUTPUT
           echo "var2=$APPEND_PRESET_LOCAL_PLUGINS" >> $GITHUB_OUTPUT
         id: vars
-      - name: Build and push - ${{ steps.get-tag.outputs.tag }}-pro
+      - name: Build and push - ${{ steps.get-tag.outputs.tag }}
         uses: docker/build-push-action@v3
         with:
           context: .
@@ -144,9 +146,9 @@ jobs:
           tags: ${{ steps.set-tags.outputs.tags }}
       - name: Deploy NocoBase
         run: |
-          curl --retry 2 --location --request POST "${{secrets.NOCOBASE_DEPLOY_HOST}}${{ steps.get-tag.outputs.tag }}-pro" \
+          curl --retry 2 --location --request POST "${{secrets.NOCOBASE_DEPLOY_HOST}}${{ steps.get-tag.outputs.tag }}" \
           --header 'Content-Type: application/json' \
           -d "{
-              \"tag\": \"${{ steps.get-tag.outputs.tag }}-pro\",
+              \"tag\": \"${{ steps.get-tag.outputs.tag }}\",
               \"dialect\": \"postgres\"
           }"