franpcode/ChatGPT
1
0
Fork 0
mirror of https://github.com/FranP-code/ChatGPT.git synced 2025-10-13 00:13:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: windows can't start

Browse Source
This commit is contained in:
lencx
2022-12-28 03:07:17 +08:00
parent bcd350584e
commit 631dee95a7
5 changed files with 156 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
.github/workflows/release.yml vendored
View File

@@ -1,89 +1,89 @@
name: Release CI # name: Release CI
on: # on:
push: # push:
# Sequence of patterns matched against refs/tags # # Sequence of patterns matched against refs/tags
tags: # tags:
- 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 # - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
jobs: # jobs:
create-release: # create-release:
runs-on: ubuntu-20.04 # runs-on: ubuntu-20.04
outputs: # outputs:
RELEASE_UPLOAD_ID: ${{ steps.create_release.outputs.id }} # RELEASE_UPLOAD_ID: ${{ steps.create_release.outputs.id }}
steps: # steps:
- uses: actions/checkout@v2 # - uses: actions/checkout@v2
- name: Query version number # - name: Query version number
id: get_version # id: get_version
shell: bash # shell: bash
run: | # run: |
echo "using version tag ${GITHUB_REF:10}" # echo "using version tag ${GITHUB_REF:10}"
echo "version=${GITHUB_REF:10}" >> $GITHUB_ENV # echo "version=${GITHUB_REF:10}" >> $GITHUB_ENV
- name: Create Release # - name: Create Release
id: create_release # id: create_release
uses: actions/create-release@v1 # uses: actions/create-release@v1
env: # env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: # with:
tag_name: '${{ env.version }}' # tag_name: '${{ env.version }}'
release_name: 'ChatGPT ${{ env.version }}' # release_name: 'ChatGPT ${{ env.version }}'
body: 'See the assets to download this version and install.' # body: 'See the assets to download this version and install.'
build-tauri: # build-tauri:
needs: create-release # needs: create-release
strategy: # strategy:
fail-fast: false # fail-fast: false
matrix: # matrix:
platform: [macos-latest, ubuntu-20.04, windows-latest] # platform: [macos-latest, ubuntu-20.04, windows-latest]
runs-on: ${{ matrix.platform }} # runs-on: ${{ matrix.platform }}
steps: # steps:
- uses: actions/checkout@v3 # - uses: actions/checkout@v3
- name: setup node # - name: setup node
uses: actions/setup-node@v3 # uses: actions/setup-node@v3
with: # with:
node-version: 16 # node-version: 16
- name: install Rust stable # - name: install Rust stable
uses: dtolnay/rust-toolchain@stable # uses: dtolnay/rust-toolchain@stable
- name: install dependencies (ubuntu only) # - name: install dependencies (ubuntu only)
if: matrix.platform == 'ubuntu-20.04' # if: matrix.platform == 'ubuntu-20.04'
run: | # run: |
sudo apt-get update # sudo apt-get update
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf # sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
- name: Install app dependencies and build it # - name: Install app dependencies and build it
run: yarn && yarn build:fe # run: yarn && yarn build:fe
- name: fix tray icon # - name: fix tray icon
if: matrix.platform != 'macos-latest' # if: matrix.platform != 'macos-latest'
run: | # run: |
yarn fix:tray # yarn fix:tray
- uses: tauri-apps/tauri-action@v0.3 # - uses: tauri-apps/tauri-action@v0.3
env: # env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# 📝: https://tauri.app/v1/guides/distribution/updater#signing-updates # # 📝: https://tauri.app/v1/guides/distribution/updater#signing-updates
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} # TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} # TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
with: # with:
releaseId: ${{ needs.create-release.outputs.RELEASE_UPLOAD_ID }} # releaseId: ${{ needs.create-release.outputs.RELEASE_UPLOAD_ID }}
updater: # updater:
runs-on: ubuntu-20.04 # runs-on: ubuntu-20.04
needs: [create-release, build-tauri] # needs: [create-release, build-tauri]
steps: # steps:
- uses: actions/checkout@v2 # - uses: actions/checkout@v2
- run: yarn # - run: yarn
- run: yarn updater --token=${{ secrets.GITHUB_TOKEN }} # - run: yarn updater --token=${{ secrets.GITHUB_TOKEN }}
- name: Deploy install.json # - name: Deploy install.json
uses: peaceiris/actions-gh-pages@v3 # uses: peaceiris/actions-gh-pages@v3
with: # with:
github_token: ${{ secrets.GITHUB_TOKEN }} # github_token: ${{ secrets.GITHUB_TOKEN }}
# 📝: Edit the deployment directory # # 📝: Edit the deployment directory
publish_dir: ./updater # publish_dir: ./updater
force_orphan: true # force_orphan: true

72
.github/workflows/win.yml vendored Normal file
View File

@@ -0,0 +1,72 @@
name: Release CI
on:
push:
# Sequence of patterns matched against refs/tags
tags:
- 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
jobs:
create-release:
runs-on: ubuntu-20.04
outputs:
RELEASE_UPLOAD_ID: ${{ steps.create_release.outputs.id }}
steps:
- uses: actions/checkout@v2
- name: Query version number
id: get_version
shell: bash
run: |
echo "using version tag ${GITHUB_REF:10}"
echo "version=${GITHUB_REF:10}" >> $GITHUB_ENV
- name: Create Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: '${{ env.version }}'
release_name: 'ChatGPT ${{ env.version }}'
body: 'See the assets to download this version and install.'
build-tauri:
needs: create-release
strategy:
fail-fast: false
matrix:
platform: [windows-latest]
runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v3
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 16
- name: install Rust stable
uses: dtolnay/rust-toolchain@stable
- name: install dependencies (ubuntu only)
if: matrix.platform == 'ubuntu-20.04'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
- name: Install app dependencies and build it
run: yarn && yarn build:fe
- name: fix tray icon
if: matrix.platform != 'macos-latest'
run: |
yarn fix:tray
- uses: tauri-apps/tauri-action@v0.3
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# 📝: https://tauri.app/v1/guides/distribution/updater#signing-updates
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
with:
releaseId: ${{ needs.create-release.outputs.RELEASE_UPLOAD_ID }}

BIN
src-tauri/icons/tray-icon-light.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 124 KiB

After

Width:  |  Height:  |  Size: 92 KiB

7
src-tauri/src/app/setup.rs
View File

@@ -1,4 +1,5 @@
use crate::{app::window, conf::ChatConfJson, utils}; use crate::{app::window, conf::ChatConfJson, utils};
use log::info;
use tauri::{utils::config::WindowUrl, window::WindowBuilder, App, GlobalShortcutManager, Manager}; use tauri::{utils::config::WindowUrl, window::WindowBuilder, App, GlobalShortcutManager, Manager};
pub fn init(app: &mut App) -> std::result::Result<(), Box<dyn std::error::Error>> { pub fn init(app: &mut App) -> std::result::Result<(), Box<dyn std::error::Error>> {
@@ -11,12 +12,15 @@ pub fn init(app: &mut App) -> std::result::Result<(), Box<dyn std::error::Error>
window::tray_window(&handle); window::tray_window(&handle);
}); });
info!("stepup");
{ {
info!("global_shortcut_start");
let handle = app.app_handle(); let handle = app.app_handle();
let mut shortcut = app.global_shortcut_manager(); let mut shortcut = app.global_shortcut_manager();
let is_mini_key = shortcut.is_registered("CmdOrCtrl+Shift+O"); let is_mini_key = shortcut.is_registered("CmdOrCtrl+Shift+O");
if !is_mini_key.unwrap() { if is_mini_key.is_ok() {
shortcut shortcut
.register("CmdOrCtrl+Shift+O", move || { .register("CmdOrCtrl+Shift+O", move || {
if let Some(w) = handle.get_window("core") { if let Some(w) = handle.get_window("core") {
@@ -30,6 +34,7 @@ pub fn init(app: &mut App) -> std::result::Result<(), Box<dyn std::error::Error>
}) })
.unwrap(); .unwrap();
}; };
info!("global_shortcut_end");
} }
if chat_conf.hide_dock_icon { if chat_conf.hide_dock_icon {

4
src-tauri/tauri.conf.json
View File

@@ -30,8 +30,8 @@
} }
}, },
"systemTray": { "systemTray": {
"iconPath": "icons/tray-icon.png", "iconPath": "icons/tray-icon-light.png",
"iconAsTemplate": true, "iconAsTemplate": false,
"menuOnLeftClick": false "menuOnLeftClick": false
}, },
"bundle": { "bundle": {