Skip to content

Commit b1ca4d0

Browse files
JerryFan626JerryFan626
authored
Merge branch 'dev' into patch-1
2 parents 37fa8a4 + 3247005 commit b1ca4d0

904 files changed

Lines changed: 65133 additions & 7116 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎.github/workflows/pushdocker.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ jobs:
5050
yarn install
5151
yarn run build:web:prod --app_version=${{ steps.chat2db_version.outputs.substring }}
5252
cp -r dist ../chat2db-server/chat2db-server-start/src/main/resources/static/front
53+
cp -r dist/index.html ../chat2db-server/chat2db-server-start/src/main/resources/thymeleaf/
5354
5455
# 安装java
5556
- name: Install Java and Maven

‎.github/workflows/release.yml‎

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,14 @@ jobs:
109109
cp -r $JAVA_HOME chat2db-client/static/jre
110110
chmod -R 777 chat2db-client/static/jre/
111111
112+
# 复制jre Linux
113+
- name: Copy Jre for Linux
114+
if: ${{ runner.os == 'Linux' }}
115+
run: |
116+
mkdir chat2db-client/static
117+
cp -r $JAVA_HOME chat2db-client/static/jre
118+
chmod -R 777 chat2db-client/static/jre/
119+
112120
# 安装node
113121
- name: Install Node.js
114122
uses: actions/setup-node@main
@@ -132,6 +140,7 @@ jobs:
132140
yarn install
133141
yarn run build:web:prod --app_version=${{ steps.chat2db_version.outputs.substring }}
134142
cp -r dist ../chat2db-server/chat2db-server-start/src/main/resources/static/front
143+
cp -r dist/index.html ../chat2db-server/chat2db-server-start/src/main/resources/thymeleaf/
135144
136145
# 编译服务端java版本
137146
- name: Build Java
@@ -213,6 +222,14 @@ jobs:
213222
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
214223
215224
# Linux
225+
- name: Delete File
226+
if: ${{ runner.os == 'Linux' }}
227+
run: |
228+
cd chat2db-client/static/jre/
229+
ls -la
230+
rm -rf legal
231+
ls -la
232+
216233
- name: Build/release Electron app for Linux
217234
if: ${{ runner.os == 'Linux' }}
218235
uses: samuelmeuli/action-electron-builder@v1
@@ -221,6 +238,7 @@ jobs:
221238
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
222239
skip_build: true
223240
args: "-c.extraMetadata.version=${{ steps.chat2db_version.outputs.substring }} --linux"
241+
release: true
224242

225243
# 准备要需要的数据 Windows
226244
- name: Prepare upload for Windows
@@ -237,7 +255,9 @@ jobs:
237255
cp chat2db-client/versions/${{ steps.chat2db_version.outputs.substring }}/static/chat2db-server-start.jar ./oss_temp_file
238256
cp -r chat2db-client/release/*.dmg ./oss_temp_file
239257
cp -r chat2db-client/versions/${{ steps.chat2db_version.outputs.substring }}/dist ./oss_temp_file/dist
240-
cd chat2db-client/versions/${{ steps.chat2db_version.outputs.substring }}/static/ && zip -r chat2db-server-start.zip ./
258+
cd chat2db-client/versions/${{ steps.chat2db_version.outputs.substring }}/ && zip -r ${{ steps.chat2db_version.outputs.substring }}.zip ./
259+
cp -r ${{ steps.chat2db_version.outputs.substring }}.zip ../../../oss_temp_file
260+
cd static/ && zip -r chat2db-server-start.zip ./
241261
cp -r chat2db-server-start.zip ../../../../oss_temp_file
242262
243263
# 准备要需要的数据 MacOS arm64
@@ -253,7 +273,6 @@ jobs:
253273
run: |
254274
mkdir oss_temp_file
255275
cp -r chat2db-client/release/*.AppImage ./oss_temp_file
256-
cp -r chat2db-client/release/*_amd64.deb ./oss_temp_file
257276
258277
# 把文件上传到OSS 方便下载
259278
- name: Set up oss utils
@@ -262,10 +281,10 @@ jobs:
262281
endpoint: "oss-accelerate.aliyuncs.com"
263282
access-key-id: ${{ secrets.OSS_ACCESS_KEY_ID }}
264283
access-key-secret: ${{ secrets.OSS_ACCESS_KEY_SECRET }}
265-
ossutil-version: "latest"
284+
ossutil-version: "1.7.16"
266285
- name: Upload to oss
267286
run: |
268-
ossutil cp -rf --acl=public-read ./oss_temp_file/ oss://chat2db/release/${{ steps.chat2db_version.outputs.substring }}/
287+
ossutil cp -rf --acl=public-read ./oss_temp_file/ oss://chat2db-client/release/${{ steps.chat2db_version.outputs.substring }}/
269288
270289
# 构建完成通知
271290
- name: Send dingtalk message for Windows
@@ -277,7 +296,7 @@ jobs:
277296
content: |
278297
{
279298
"title": "Windows-release-打包完成通知",
280-
"text": "# Windows-release-打包完成通知 \n ![bang](https://oss-chat2db.alibaba.com/static/happy100.jpg) \n ### 任务id：[${{ github.run_id }}](https://github.com/chat2db/Chat2DB/actions/runs/${{ github.run_id }}) \n ### Windows下载地址：[https://oss-chat2db.alibaba.com/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB%20Setup%20${{ steps.chat2db_version.outputs.substring }}.exe](https://oss-chat2db.alibaba.com/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB%20Setup%20${{ steps.chat2db_version.outputs.substring }}.exe) "
299+
"text": "# Windows-release-打包完成通知 \n ![bang](https://oss.sqlgpt.cn/static/happy100.jpg) \n ### 任务id：[${{ github.run_id }}](https://github.com/chat2db/Chat2DB/actions/runs/${{ github.run_id }}) \n ### Windows下载地址：[https://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB%20Setup%20${{ steps.chat2db_version.outputs.substring }}.exe](https://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB%20Setup%20${{ steps.chat2db_version.outputs.substring }}.exe) "
281300
}
282301
283302
# 构建完成通知
@@ -290,7 +309,7 @@ jobs:
290309
content: |
291310
{
292311
"title": "MacOS-amd64-release-构建完成通知",
293-
"text": "# MacOS-amd64-release-打包完成通知 \n ![bang](https://oss-chat2db.alibaba.com/static/happy100.jpg) \n ### 任务id：[${{ github.run_id }}](https://github.com/chat2db/Chat2DB/actions/runs/${{ github.run_id }}) \n ### Intel芯片下载地址：[https://oss-chat2db.alibaba.com/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}.dmg](https://oss-chat2db.alibaba.com/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}.dmg) \n ### jar包下载地址：[https://oss-chat2db.alibaba.com/release/${{ steps.chat2db_version.outputs.substring }}/chat2db-server-start.zip](https://oss-chat2db.alibaba.com/release/${{ steps.chat2db_version.outputs.substring }}/chat2db-server-start.zip) "
312+
"text": "# MacOS-amd64-release-打包完成通知 \n ![bang](https://oss.sqlgpt.cn/static/happy100.jpg) \n ### 任务id：[${{ github.run_id }}](https://github.com/chat2db/Chat2DB/actions/runs/${{ github.run_id }}) \n ### Intel芯片下载地址：[https://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}.dmg](https://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}.dmg) \n ### jar包下载地址：[https://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/chat2db-server-start.zip](https://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/chat2db-server-start.zip) "
294313
}
295314
296315
# 构建完成通知
@@ -303,7 +322,7 @@ jobs:
303322
content: |
304323
{
305324
"title": "MacOS-arm64-release-构建完成通知",
306-
"text": "# MacOS-arm64-release-打包完成通知 \n ![bang](https://oss-chat2db.alibaba.com/static/happy100.jpg) \n ### 任务id：[${{ github.run_id }}](https://github.com/chat2db/Chat2DB/actions/runs/${{ github.run_id }}) \n ### Apple芯片下载地址：[https://oss-chat2db.alibaba.com/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}-arm64.dmg](https://oss-chat2db.alibaba.com/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}-arm64.dmg) "
325+
"text": "# MacOS-arm64-release-打包完成通知 \n ![bang](https://oss.sqlgpt.cn/static/happy100.jpg) \n ### 任务id：[${{ github.run_id }}](https://github.com/chat2db/Chat2DB/actions/runs/${{ github.run_id }}) \n ### Apple芯片下载地址：[https://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}-arm64.dmg](https://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}-arm64.dmg) "
307326
}
308327
309328
# 构建完成通知
@@ -316,5 +335,5 @@ jobs:
316335
content: |
317336
{
318337
"title": "Linux-test-打包完成通知",
319-
"text": "# Linux-test-打包完成通知 \n ![bang]https://oss-chat2db.alibaba.com/static/happy100.jpg) \n ### 任务id：[${{ github.run_id }}](https://github.com/chat2db/Chat2DB/actions/runs/${{ github.run_id }}) \n ### Linux下载地址：[https://oss-chat2db.alibaba.com/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}.AppImage](https://oss-chat2db.alibaba.com/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}.AppImage)"
338+
"text": "# Linux-test-打包完成通知 \n ![bang](https://oss.sqlgpt.cn/static/happy100.jpg) \n ### 任务id：[${{ github.run_id }}](https://github.com/chat2db/Chat2DB/actions/runs/${{ github.run_id }}) \n ### Linux下载地址：[https://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}.AppImage](https://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}.AppImage)"
320339
}

0 commit comments

Comments
 (0)