Merge pull request tw93#717 from YangguangZhou/master

Add Safe Domain in Github Action and Optimize imgs
ENIAC1729 · May 29, 2024 · 06870e5 · 06870e5
2 parents 166885a + 80bd3f3
commit 06870e5
Show file tree

Hide file tree

Showing 17 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/pake-cli.yaml b/.github/workflows/pake-cli.yaml
@@ -28,6 +28,9 @@ on:
         description: '[Height, Optional]'
         required: false
         default: '780'
+      safe_domain:
+        description: '[Safe Domain, Optional]'
+        required: false
       hide_title_bar:
         description: '[Hide TitleBar, Optional, MacOS only]'
         required: false
@@ -129,6 +132,7 @@ jobs:
           RESIZE: ${{ inputs.resize }}
           MULTI_ARCH: ${{ inputs.multi_arch }}
           TARGETS: ${{ inputs.targets }}
+          SAFE_DOMAIN: ${{ inputs.safe_domain }}
 
       - name: Upload archive
         uses: actions/upload-artifact@v3

diff --git a/script/build_with_pake_cli.js b/script/build_with_pake_cli.js
@@ -17,6 +17,7 @@ console.log('hide-title-bar: ', process.env.HIDE_TITLE_BAR);
 console.log('resize: ', process.env.RESIZE);
 console.log('is multi arch? only for Mac: ', process.env.MULTI_ARCH);
 console.log('targets type? only for Linux: ', process.env.TARGETS);
+console.log('safe-domain: ', process.env.SAFE_DOMAIN);
 console.log('===========================\n');
 
 cd('node_modules/pake-cli');
@@ -39,11 +40,11 @@ if (process.env.TARGETS) {
   params = `${params} --targets ${process.env.TARGETS}`;
 }
 
-if (process.platform === 'win32') {
-  params = `${params} --show-system-tray`;
+if (process.env.SAFE_DOMAIN) {
+  params = `${params} --safe-domain ${process.env.SAFE_DOMAIN}`;
 }
 
-if (process.platform === 'linux') {
+if (process.platform === 'win32' || process.platform === 'linux') {
   params = `${params} --show-system-tray`;
 }
 

diff --git a/src-tauri/png/chatgpt_512.png b/src-tauri/png/chatgpt_512.png
diff --git a/src-tauri/png/coderunner_512.png b/src-tauri/png/coderunner_512.png
diff --git a/src-tauri/png/flomo_512.png b/src-tauri/png/flomo_512.png
diff --git a/src-tauri/png/icon_512.png b/src-tauri/png/icon_512.png
diff --git a/src-tauri/png/lizhi_512.png b/src-tauri/png/lizhi_512.png
diff --git a/src-tauri/png/poe_512.png b/src-tauri/png/poe_512.png
diff --git a/src-tauri/png/programmusic_512.png b/src-tauri/png/programmusic_512.png
diff --git a/src-tauri/png/qwerty_512.png b/src-tauri/png/qwerty_512.png
diff --git a/src-tauri/png/reference_512.png b/src-tauri/png/reference_512.png
diff --git a/src-tauri/png/twitter_512.png b/src-tauri/png/twitter_512.png
diff --git a/src-tauri/png/wechat_512.png b/src-tauri/png/wechat_512.png
diff --git a/src-tauri/png/weread_512.png b/src-tauri/png/weread_512.png
diff --git a/src-tauri/png/xiaohongshu_512.png b/src-tauri/png/xiaohongshu_512.png
diff --git a/src-tauri/png/youtube_512.png b/src-tauri/png/youtube_512.png
diff --git a/src-tauri/png/youtubemusic_512.png b/src-tauri/png/youtubemusic_512.png