test release

chat2db-jerry · chat2db-jerry · commit 712fbe9c8189 · 2023-07-01T20:18:56.000+08:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -88,20 +88,24 @@ jobs:
       - name: Copy Jre for Windows
         if: ${{ runner.os == 'Windows' }}
         run: |
-          cp -r "${{ env.JAVA_HOME }}" ali-dbhub-client/electron/jre
+          mkdir chat2db-client/static
+          cp -r "${{ env.JAVA_HOME }}" chat2db-client/static/jre
 
       # 复制jre macOS
       - name: Copy Jre for macOS
         if: ${{ runner.os == 'macOS' }}
         run: |
-          cp -r $JAVA_HOME ali-dbhub-client/electron/jre
-          chmod -R 777 ali-dbhub-client/electron/jre/
+          mkdir chat2db-client/static
+          cp -r $JAVA_HOME chat2db-client/static/jre
+          chmod -R 777 chat2db-client/static/jre/
 
       # 安装node
       - name: Install Node.js
         uses: actions/setup-node@main
         with:
           node-version: 16
+          cache: 'yarn'
+          cache-dependency-path: chat2db-client/yarn.lock
 
       # 安装java
       - name: Install Java and Maven
@@ -118,6 +122,15 @@ jobs:
           npm install 
           npm run build:desktop
           cp -r dist ../ali-dbhub-server/ali-dbhub-server-start/src/main/resources/static/front
+          
+
+      # 构建静态文件信息
+      - name: Yarn install & build & copy
+        run: |
+          cd chat2db-client
+          yarn install 
+          yarn run build:web:prod --appVersion=${{ steps.chat2db_version.outputs.substring }}
+          cp -r dist ../chat2db-server/chat2db-server-start/src/main/resources/static/front
 
       # 编译服务端java版本
       - name: Build Java
@@ -126,24 +139,23 @@ jobs:
       # 复制服务端java 到指定位置
       - name: Copy App
         run: |
-          mkdir ali-dbhub-client/electron/app
-          cp ali-dbhub-server/ali-dbhub-server-start/target/ali-dbhub-server-start.jar ali-dbhub-client/electron/app/
+          cp chat2db-server/chat2db-server-start/target/chat2db-server-start.jar chat2db-client/static/
 
-      # 安装electron
-      - name: Npm install electron
+      - name: Prepare Build Electron
         run: |
-          cd ali-dbhub-client/electron
-          cp -r ../dist ./
+          cd chat2db-client
+          yarn run build:web:desktop --appVersion=${{ steps.chat2db_version.outputs.substring }}
 
       # windows
       - name: Build/release Electron app for Windows
         if: ${{ runner.os == 'Windows' }}
         uses: samuelmeuli/action-electron-builder@v1
         with:
-          package_root: "ali-dbhub-client/electron"
+          package_root: "chat2db-client/"
           GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
           mac_certs: ${{ secrets.mac_certs }}
           mac_certs_password: ${{ secrets.mac_certs_password }}
+          skip_build: true
           args: "-c.extraMetadata.version=${{ steps.chat2db_version.outputs.substring }} --win --x64"
           release: true
 
@@ -152,58 +164,61 @@ jobs:
         if: ${{ runner.os == 'macOS' && matrix.arch == 'amd64' }}
         uses: samuelmeuli/action-electron-builder@v1
         with:
-          package_root: "ali-dbhub-client/electron"
+          package_root: "chat2db-client/"
           GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
           mac_certs: ${{ secrets.mac_certs }}
           mac_certs_password: ${{ secrets.mac_certs_password }}
+          skip_build: true
           args: "-c.extraMetadata.version=${{ steps.chat2db_version.outputs.substring }} --mac --x64"
           release: true
 
+
       # amd64 notarization
       - name: Notarization amd64 App
         if: ${{ runner.os == 'macOS' && matrix.arch == 'amd64' }}
         run: |
-          xcrun altool --notarize-app --primary-bundle-id "${{secrets.MAC_PRIMARY_BUNDLE_ID}}" --username "${{secrets.MAC_APPLE_ID}}" --password "${{secrets.MAC_APPLE_PASSWORD}}" --asc-provider "${{secrets.MAC_ASC_PROVIDER}}" -t osx --file ali-dbhub-client/electron-build/Chat2DB-${{ steps.chat2db_version.outputs.substring }}.dmg
+          xcrun altool --notarize-app --primary-bundle-id "${{secrets.MAC_PRIMARY_BUNDLE_ID}}" --username "${{secrets.MAC_APPLE_ID}}" --password "${{secrets.MAC_APPLE_PASSWORD}}" --asc-provider "${{secrets.MAC_ASC_PROVIDER}}" -t osx --file chat2db-client/release/Chat2DB-${{ steps.chat2db_version.outputs.substring }}.dmg
 
-      # macos amd64
+      # macos arm64
       - name: Build/release Electron app for MacOS arm64
         if: ${{ runner.os == 'macOS' && matrix.arch == 'arm64' }}
         uses: samuelmeuli/action-electron-builder@v1
         with:
-          package_root: "ali-dbhub-client/electron"
+          package_root: "chat2db-client/"
           GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
           mac_certs: ${{ secrets.mac_certs }}
           mac_certs_password: ${{ secrets.mac_certs_password }}
+          skip_build: true
           args: "-c.extraMetadata.version=${{ steps.chat2db_version.outputs.substring }} --mac --arm64"
           release: true
 
       # arm notarization
       - name: Notarization arm64 App
         if: ${{ runner.os == 'macOS' && matrix.arch == 'arm64' }}
         run: |
-          xcrun altool --notarize-app --primary-bundle-id "${{secrets.MAC_PRIMARY_BUNDLE_ID}}" --username "${{secrets.MAC_APPLE_ID}}" --password "${{secrets.MAC_APPLE_PASSWORD}}" --asc-provider "${{secrets.MAC_ASC_PROVIDER}}" -t osx --file ali-dbhub-client/electron-build/Chat2DB-${{ steps.chat2db_version.outputs.substring }}-arm64.dmg
+          xcrun altool --notarize-app --primary-bundle-id "${{secrets.MAC_PRIMARY_BUNDLE_ID}}" --username "${{secrets.MAC_APPLE_ID}}" --password "${{secrets.MAC_APPLE_PASSWORD}}" --asc-provider "${{secrets.MAC_ASC_PROVIDER}}" -t osx --file chat2db-client/release/Chat2DB-${{ steps.chat2db_version.outputs.substring }}-arm64.dmg
 
       # 准备要需要的数据 Windows
       - name: Prepare upload for Windows
         if: runner.os == 'Windows'
         run: |
           mkdir oss_temp_file
-          cp -r ali-dbhub-client/electron-build/*Setup*.exe ./oss_temp_file
+          cp -r chat2db-client/release/*Setup*.exe ./oss_temp_file
 
       # 准备要需要的数据 MacOS amd64
       - name: Prepare upload for MacOS amd64
         if: ${{ runner.os == 'macOS' && matrix.arch == 'amd64' }}
         run: |
           mkdir oss_temp_file
-          cp ali-dbhub-client/electron/app/ali-dbhub-server-start.jar ./oss_temp_file
-          cp -r ali-dbhub-client/electron-build/*.dmg ./oss_temp_file
+          cp chat2db-client/static/chat2db-server-start.jar  ./oss_temp_file
+          cp -r chat2db-client/release/*.dmg ./oss_temp_file
 
       # 准备要需要的数据 MacOS arm64
       - name: Prepare upload for MacOS arm64
         if: ${{ runner.os == 'macOS' && matrix.arch == 'arm64' }}
         run: |
           mkdir oss_temp_file
-          cp -r ali-dbhub-client/electron-build/*.dmg ./oss_temp_file
+          cp -r chat2db-client/release/*.dmg ./oss_temp_file
 
       # 把文件上传到OSS 方便下载
       - name: Set up oss utils
