From 8caf1d715482461bb6dcad1409edbfce51da2301 Mon Sep 17 00:00:00 2001
From: onlyjackfrost <onlyjackfrost@gmail.com>
Date: Mon, 3 Mar 2025 17:46:41 +0800
Subject: [PATCH] chore(wren-ui): update release image flow and revert
 package.json version

---
 .../workflows/ui-release-image-stable.yaml    | 114 +++++++++---------
 wren-ui/package.json                          |   4 +-
 2 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/.github/workflows/ui-release-image-stable.yaml b/.github/workflows/ui-release-image-stable.yaml
index 4cc59712f1..f22014f38d 100644
--- a/.github/workflows/ui-release-image-stable.yaml
+++ b/.github/workflows/ui-release-image-stable.yaml
@@ -16,62 +16,7 @@ defaults:
     working-directory: wren-ui
 
 jobs:
-  tag-ui-version:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Generate a token
-        id: generate-token
-        uses: actions/create-github-app-token@v1
-        with:
-          app-id: ${{ vars.CI_APP_ID }}
-          private-key: ${{ secrets.CI_APP_PRIVATE_KEY }}
-      - uses: actions/checkout@v4
-        with:
-          token: ${{ steps.generate-token.outputs.token }}
-          fetch-depth: 0
-      - name: Set up Git
-        run: |
-          git config --global user.name "wren-ai[bot]"
-          git config --global user.email "dev@cannerdata.com"
-      - name: Generate and Save Change Log
-        id: changelog
-        run: |
-          echo "Generating change log..."
-          PREVIOUS_VERSION=release/ui/$(jq -r '.version' package.json)
-          echo "Previous version: $PREVIOUS_VERSION"
-          echo "================ change log ================"
-          CHANGE_LOG=$(git log --pretty=format:"%s" $PREVIOUS_VERSION..HEAD | grep wren-ui)
-          echo "================ change log ================"
-
-          # Separate the change log into categories
-          FEATURES=$(echo "$CHANGE_LOG" | grep "^feat" | sed 's/^/- /')
-          FIXES_AND_CHORES=$(echo "$CHANGE_LOG" | grep -E "^(fix|chore)" | sed 's/^/- /')
-
-          # Create the full change log
-          FULL_CHANGE_LOG="\nChangelog for the version\n"
-          if [ -n "$FEATURES" ]; then
-            FULL_CHANGE_LOG+="\nFeature and Enhancement\n$FEATURES"
-          fi
-          if [ -n "$FIXES_AND_CHORES" ]; then
-            FULL_CHANGE_LOG+="\n\nFixes and Chores\n$FIXES_AND_CHORES"
-          fi
-
-          {
-            echo "CHANGE_LOG<<EOF"
-            echo -e "$FULL_CHANGE_LOG"
-            echo EOF
-          } >> $GITHUB_ENV
-      - name: Update Wren-UI version
-        run: |
-          version=${{ github.event.inputs.version }}
-          sed -i 's/"version": "[^"]*"/"version": "'"$version"'"/' package.json
-          git add package.json
-          git commit -m "update wren-ui version to $version"
-          git push
-          git tag -a "release/ui/$version" -m "${{ env.CHANGE_LOG }}"
-          git push origin "release/ui/$version"
   build-image:
-    needs: [ tag-ui-version ]
     strategy:
       fail-fast: false
       matrix:
@@ -117,7 +62,7 @@ jobs:
           retention-days: 1
   merge:
     runs-on: ubuntu-latest
-    needs: [ tag-ui-version, build-image ]
+    needs: [build-image]
     steps:
       - name: Download digests
         uses: actions/download-artifact@v4
@@ -146,4 +91,59 @@ jobs:
           TAGS=$(echo "${{ steps.meta.outputs.tags }}" | awk '{printf "--tag %s ", $0}')
           docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(printf '${{ env.WREN_UI_IMAGE }}@sha256:%s ' *) \
-            $TAGS
\ No newline at end of file
+            $TAGS
+  tag-ui-version:
+    runs-on: ubuntu-latest
+    needs: [merge]
+    steps:
+      - name: Generate a token
+        id: generate-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ vars.CI_APP_ID }}
+          private-key: ${{ secrets.CI_APP_PRIVATE_KEY }}
+      - uses: actions/checkout@v4
+        with:
+          token: ${{ steps.generate-token.outputs.token }}
+          fetch-depth: 0
+      - name: Set up Git
+        run: |
+          git config --global user.name "wren-ai[bot]"
+          git config --global user.email "dev@cannerdata.com"
+      - name: Generate and Save Change Log
+        id: changelog
+        run: |
+          echo "Generating change log..."
+          PREVIOUS_VERSION=release/ui/$(jq -r '.version' package.json)
+          echo "Previous version: $PREVIOUS_VERSION"
+          echo "================ change log ================"
+          CHANGE_LOG=$(git log --pretty=format:"%s" $PREVIOUS_VERSION..HEAD | grep wren-ui)
+          echo "================ change log ================"
+
+          # Separate the change log into categories
+          FEATURES=$(echo "$CHANGE_LOG" | grep "^feat" | sed 's/^/- /')
+          FIXES_AND_CHORES=$(echo "$CHANGE_LOG" | grep -E "^(fix|chore)" | sed 's/^/- /')
+
+          # Create the full change log
+          FULL_CHANGE_LOG="\nChangelog for the version\n"
+          if [ -n "$FEATURES" ]; then
+            FULL_CHANGE_LOG+="\nFeature and Enhancement\n$FEATURES"
+          fi
+          if [ -n "$FIXES_AND_CHORES" ]; then
+            FULL_CHANGE_LOG+="\n\nFixes and Chores\n$FIXES_AND_CHORES"
+          fi
+
+          {
+            echo "CHANGE_LOG<<EOF"
+            echo -e "$FULL_CHANGE_LOG"
+            echo EOF
+          } >> $GITHUB_ENV
+      - name: Update Wren-UI version
+        run: |
+          version=${{ github.event.inputs.version }}
+          sed -i 's/"version": "[^"]*"/"version": "'"$version"'"/' package.json
+          git add package.json
+          git commit -m "update wren-ui version to $version"
+          git push
+          git tag -a "release/ui/$version" -m "${{ env.CHANGE_LOG }}"
+          git push origin "release/ui/$version"
diff --git a/wren-ui/package.json b/wren-ui/package.json
index b3cc8424cf..ddd5850275 100644
--- a/wren-ui/package.json
+++ b/wren-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wren-ui",
-  "version": "0.20.2",
+  "version": "0.20.1",
   "private": true,
   "scripts": {
     "dev": "next dev",
@@ -102,4 +102,4 @@
     "@server": "src/apollo/server"
   },
   "packageManager": "yarn@4.5.3"
-}
+}
\ No newline at end of file