Skip to content

Commit 536ad6f

Browse files
chat2db-jerrychat2db-jerry
committed
Merge remote-tracking branch 'origin/main' into mongo
2 parents 463d330 + e827bab commit 536ad6f

329 files changed

Lines changed: 11001 additions & 8873 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/release.yml‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
# Workflow's jobs
1212
# 一共需要3台电脑运行
1313
# windows
14-
# macos-latest amd64
14+
# macos-latest x86_64
1515
# macos-latest arm64
1616
jobs:
1717
release:
@@ -21,7 +21,7 @@ jobs:
2121
include:
2222
- os: windows-latest
2323
- os: macos-latest
24-
arch: amd64
24+
arch: x86_64
2525
- os: macos-latest
2626
arch: arm64
2727
- os: ubuntu-latest
@@ -56,7 +56,7 @@ jobs:
5656

5757
# 安装jre MacOS X64
5858
- name: Install Jre MacOS X64
59-
if: ${{ runner.os == 'macOS' && matrix.arch == 'amd64' }}
59+
if: ${{ runner.os == 'macOS' && matrix.arch == 'x86_64' }}
6060
uses: actions/setup-java@main
6161
with:
6262
java-version: "17"
@@ -161,7 +161,7 @@ jobs:
161161
- name: Copy App
162162
run: |
163163
cp chat2db-server/chat2db-server-start/target/chat2db-server-start.jar chat2db-client/versions/${{ steps.chat2db_version.outputs.substring }}/static/
164-
cp -r chat2db-server/chat2db-server-start/target/lib chat2db-client/versions/${{ steps.chat2db_version.outputs.substring }}/static/lib
164+
# cp -r chat2db-server/chat2db-server-start/target/lib chat2db-client/versions/${{ steps.chat2db_version.outputs.substring }}/static/lib
165165

166166
- name: Prepare Build Electron
167167
run: |
@@ -183,9 +183,9 @@ jobs:
183183
args: "-c.extraMetadata.version=${{ steps.chat2db_version.outputs.substring }} --win --x64"
184184
release: true
185185

186-
# macos amd64
186+
# macos x86_64
187187
- name: Build/release Electron app for MacOS X64
188-
if: ${{ runner.os == 'macOS' && matrix.arch == 'amd64' }}
188+
if: ${{ runner.os == 'macOS' && matrix.arch == 'x86_64' }}
189189
uses: samuelmeuli/action-electron-builder@v1
190190
with:
191191
package_root: "chat2db-client/"
@@ -196,12 +196,13 @@ jobs:
196196
args: "-c.extraMetadata.version=${{ steps.chat2db_version.outputs.substring }} --mac --x64"
197197
release: true
198198

199-
# amd64 notarization
200-
- name: Notarization amd64 App
201-
if: ${{ runner.os == 'macOS' && matrix.arch == 'amd64' }}
199+
# x86_64 notarization
200+
- name: Notarization x86_64 App
201+
if: ${{ runner.os == 'macOS' && matrix.arch == 'x86_64' }}
202202
run: |
203-
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
204-
203+
xcrun notarytool store-credentials "Chat2DB" --apple-id "${{secrets.MAC_APPLE_ID}}" --password "${{secrets.MAC_APPLE_PASSWORD}}" --team-id "${{secrets.MAC_TEAM_ID}}"
204+
xcrun notarytool submit chat2db-client/release/Chat2DB-${{ steps.chat2db_version.outputs.substring }}.dmg --keychain-profile "Chat2DB"
205+
205206
# macos arm64
206207
- name: Build/release Electron app for MacOS arm64
207208
if: ${{ runner.os == 'macOS' && matrix.arch == 'arm64' }}
@@ -219,7 +220,8 @@ jobs:
219220
- name: Notarization arm64 App
220221
if: ${{ runner.os == 'macOS' && matrix.arch == 'arm64' }}
221222
run: |
222-
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
223+
xcrun notarytool store-credentials "Chat2DB" --apple-id "${{secrets.MAC_APPLE_ID}}" --password "${{secrets.MAC_APPLE_PASSWORD}}" --team-id "${{secrets.MAC_TEAM_ID}}"
224+
xcrun notarytool submit chat2db-client/release/Chat2DB-${{ steps.chat2db_version.outputs.substring }}-arm64.dmg --keychain-profile "Chat2DB"
223225
224226
# Linux
225227
- name: Delete File
@@ -247,9 +249,9 @@ jobs:
247249
mkdir oss_temp_file
248250
cp -r chat2db-client/release/*Setup*.exe ./oss_temp_file
249251
250-
# 准备要需要的数据 MacOS amd64
251-
- name: Prepare upload for MacOS amd64
252-
if: ${{ runner.os == 'macOS' && matrix.arch == 'amd64' }}
252+
# 准备要需要的数据 MacOS x86_64
253+
- name: Prepare upload for MacOS x86_64
254+
if: ${{ runner.os == 'macOS' && matrix.arch == 'x86_64' }}
253255
run: |
254256
mkdir oss_temp_file
255257
cp chat2db-client/versions/${{ steps.chat2db_version.outputs.substring }}/static/chat2db-server-start.jar ./oss_temp_file
@@ -300,16 +302,16 @@ jobs:
300302
}
301303
302304
# 构建完成通知
303-
- name: Send dingtalk message for MacOS amd64
304-
if: ${{ runner.os == 'macOS' && matrix.arch == 'amd64' }}
305+
- name: Send dingtalk message for MacOS x86_64
306+
if: ${{ runner.os == 'macOS' && matrix.arch == 'x86_64' }}
305307
uses: ghostoy/dingtalk-action@master
306308
with:
307309
webhook: ${{ secrets.DINGTALK_WEBHOOK }}
308310
msgtype: markdown
309311
content: |
310312
{
311-
"title": "MacOS-amd64-release-构建完成通知",
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) "
313+
"title": "MacOS-x86_64-release-构建完成通知",
314+
"text": "# MacOS-x86_64-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) "
313315
}
314316
315317
# 构建完成通知

0 commit comments

Comments
 (0)