Skip to content

Commit

Permalink
Merge pull request #847 from Hi-Windom/v0.35
Browse files Browse the repository at this point in the history
V0.35
  • Loading branch information
Soltus authored Jun 27, 2024
2 parents 9e91784 + ff156cd commit 13ab6bc
Show file tree
Hide file tree
Showing 142 changed files with 141 additions and 70,159 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ needs.create_release.outputs.upload_url }}
asset_name: ${{ env.repo_name }}-${{ needs.create_release.outputs.release_version }}-beta_github.apk
asset_name: ${{ env.repo_name }}-${{ needs.create_release.outputs.release_version }}-beta_arm64.apk
asset_path: ${{ steps.sign_app.outputs.signedReleaseFile }}

- name: 📤 Upload logs to artifact if failure
Expand Down
2 changes: 1 addition & 1 deletion .vscode/extensions/Sillot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "sillot",
"displayName": "汐洛 Sillot",
"description": "汐洛彖夲肜矩阵(Sillot T☳Converbenk Matrix)为智慧新彖务服务。此插件为汐洛官方插件,提供多功能一体化集成。",
"version": "0.35.24062708",
"version": "0.35.24062712",
"preview": true,
"repository": "https://github.com/Hi-Windom/Sillot",
"publisher": "Hi-Windom",
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential && \
cd kernel && go build --tags fts5 -v -ldflags "-s -w" && \
mkdir /opt/Sillot/ && \
rm /Hi-Windom/Sillot/app/appearance/langs/zh_CHT.json && \
rm /Hi-Windom/Sillot/app/appearance/langs/fr_FR.json && \
rm /Hi-Windom/Sillot/app/appearance/langs/es_ES.json && \
rm /Hi-Windom/Sillot/app/appearance/langs/fr_FR.json && \
rm /Hi-Windom/Sillot/app/appearance/langs/ja_JP.json && \
rm /Hi-Windom/Sillot/app/appearance/langs/zh_CHT.json && \
mv /Hi-Windom/Sillot/app/appearance/ /opt/Sillot/ && \
mv /Hi-Windom/Sillot/app/stage/ /opt/Sillot/ && \
mv /Hi-Windom/Sillot/app/guide/ /opt/Sillot/ && \
Expand Down
1 change: 1 addition & 0 deletions app/appearance/langs/en_US.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"emptyPlaceholder": "Write something, ' / ' for commands",
"publish": "Publish",
"publishService": "Publish service",
"publishServiceNotStarted": "Publish Service Not Started",
Expand Down
1 change: 1 addition & 0 deletions app/appearance/langs/es_ES.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"emptyPlaceholder": "Escribe algo, ' / ' para los comandos",
"publish": "Publicar",
"publishService": "Publicar servicio",
"publishServiceNotStarted": "Servicio de publicación no iniciado",
Expand Down
1 change: 1 addition & 0 deletions app/appearance/langs/fr_FR.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"emptyPlaceholder": "Écrivez quelque chose, ' / ' pour les commandes",
"publish": "Publier",
"publishService": "Publier le service",
"publishServiceNotStarted": "Service de publication non démarré",
Expand Down
1 change: 1 addition & 0 deletions app/appearance/langs/ja_JP.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"emptyPlaceholder": "何か書いてください。コマンドの場合は「/」",
"publish": "公開する",
"publishService": "サービスを公開",
"publishServiceNotStarted": "サービスが開始されていません",
Expand Down
1 change: 1 addition & 0 deletions app/appearance/langs/zh_CHT.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"emptyPlaceholder": "寫點什麼,或按下 ' / ' 查看指令",
"publish": "發布",
"publishService": "發布服務",
"publishServiceNotStarted": "發布服務未啟動",
Expand Down
1 change: 1 addition & 0 deletions app/appearance/langs/zh_CN.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"emptyPlaceholder": "写点什么,或按下 ' / ' 查看命令",
"publish": "发布",
"publishService": "发布服务",
"publishServiceNotStarted": "发布服务未启动",
Expand Down
4 changes: 3 additions & 1 deletion app/electron-builder-arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ extraResources:
filter: "!**/{.DS_Store}"
- from: "appearance/langs"
to: "appearance/langs"
filter: "!**/{.DS_Store}"
filter:
- "**/zh_CN.json"
- "**/en_US.json"
- from: "appearance/emojis"
to: "appearance/emojis"
filter: "!**/{.DS_Store}"
Expand Down
67 changes: 0 additions & 67 deletions app/electron-builder-darwin-arm64.yml

This file was deleted.

67 changes: 0 additions & 67 deletions app/electron-builder-darwin.yml

This file was deleted.

4 changes: 3 additions & 1 deletion app/electron-builder-linux-arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ extraResources:
filter: "!**/{.DS_Store}"
- from: "appearance/langs"
to: "appearance/langs"
filter: "!**/{.DS_Store}"
filter:
- "**/zh_CN.json"
- "**/en_US.json"
- from: "appearance/emojis"
to: "appearance/emojis"
filter: "!**/{.DS_Store}"
Expand Down
4 changes: 3 additions & 1 deletion app/electron-builder-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ extraResources:
filter: "!**/{.DS_Store}"
- from: "appearance/langs"
to: "appearance/langs"
filter: "!**/{.DS_Store,zh_CHT.json,fr_FR.json,es_ES.json}"
filter:
- "**/zh_CN.json"
- "**/en_US.json"
- from: "appearance/emojis"
to: "appearance/emojis"
filter: "!**/{.DS_Store}"
Expand Down
4 changes: 3 additions & 1 deletion app/electron-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ extraResources:
filter: "!**/{.DS_Store}"
- from: "appearance/langs"
to: "appearance/langs"
filter: "!**/{.DS_Store,zh_CHT.json,fr_FR.json,es_ES.json}"
filter:
- "**/zh_CN.json"
- "**/en_US.json"
- from: "appearance/emojis"
to: "appearance/emojis"
filter: "!**/{.DS_Store}"
Expand Down
Loading

0 comments on commit 13ab6bc

Please sign in to comment.