Skip to content

Commit 2d1fe2c

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/main'
2 parents 1aa3b57 + d383444 commit 2d1fe2c

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

.github/workflows/release.yml

+8-3
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ jobs:
6262
java-version: "17"
6363
distribution: "temurin"
6464
java-package: "jre"
65+
architecture: "x64"
6566

6667
# Install jre MacOS arm64
6768
- name: Install Jre MacOS arm64
@@ -86,7 +87,11 @@ jobs:
8687
- name: Enable tls1
8788
if: ${{ runner.os == 'Windows' }}
8889
run: |
89-
sed -i '' "s/\(^jdk.tls.disabledAlgorithms=\)\(.*\)\( TLSv1, TLSv1.1,\)\(.*\)/\1\2\4/" "${{ env.JAVA_HOME }}/conf/security/java.security"
90+
# sed -i '' "s/\(^jdk.tls.disabledAlgorithms=\)\(.*\)\( TLSv1, TLSv1.1,\)\(.*\)/\1\2\4/" "${{ env.JAVA_HOME }}\conf\security\java.security"
91+
$filePath = "${{ env.JAVA_HOME }}\conf\security\java.security"
92+
$content = Get-Content $filePath -Raw
93+
$updatedContent = $content -replace '^(jdk.tls.disabledAlgorithms=)(.*)( TLSv1, TLSv1.1,)(.*)', '$1$2$4'
94+
$updatedContent | Set-Content $filePath
9095
shell: pwsh
9196

9297
# java.security open tls1 macOS
@@ -206,7 +211,7 @@ jobs:
206211
run: |
207212
xcrun notarytool store-credentials "Chat2DB" --apple-id "${{secrets.MAC_APPLE_ID}}" --password "${{secrets.MAC_APPLE_PASSWORD}}" --team-id "${{secrets.MAC_TEAM_ID}}"
208213
xcrun notarytool submit chat2db-client/release/Chat2DB-${{ steps.chat2db_version.outputs.substring }}.dmg --keychain-profile "Chat2DB"
209-
214+
210215
# macos arm64
211216
- name: Build/release Electron app for MacOS arm64
212217
if: ${{ runner.os == 'macOS' && matrix.arch == 'arm64' }}
@@ -342,4 +347,4 @@ jobs:
342347
{
343348
"title": "Linux-test-打包完成通知",
344349
"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)"
345-
}
350+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
delete from DATA_SOURCE where ALIAS ='[email protected]';
2+
3+
delete from DASHBOARD where id =ID;
4+
5+
delete from CHART where id<=3;
6+
7+
delete from DASHBOARD_CHART_RELATION where CHART_ID<=3;

0 commit comments

Comments
 (0)