forked from XiaoMo/ChatGPT-Next-Web
Merge pull request #2213 from Yidadaa/bugfix-0701
feat: mac os arm64 bundle
This commit is contained in:
commit
564709aa98
23
.github/workflows/app.yml
vendored
23
.github/workflows/app.yml
vendored
@ -39,9 +39,21 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
platform: [macos-latest, ubuntu-20.04, windows-latest]
|
config:
|
||||||
|
- os: ubuntu-latest
|
||||||
|
arch: x86_64
|
||||||
|
rust_target: x86_64-unknown-linux-gnu
|
||||||
|
- os: macos-latest
|
||||||
|
arch: x86_64
|
||||||
|
rust_target: x86_64-apple-darwin
|
||||||
|
- os: macos-latest
|
||||||
|
arch: aarch64
|
||||||
|
rust_target: aarch64-apple-darwin
|
||||||
|
- os: windows-latest
|
||||||
|
arch: x86_64
|
||||||
|
rust_target: x86_64-pc-windows-msvc
|
||||||
|
|
||||||
runs-on: ${{ matrix.platform }}
|
runs-on: ${{ matrix.config.os }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: setup node
|
- name: setup node
|
||||||
@ -50,8 +62,13 @@ jobs:
|
|||||||
node-version: 16
|
node-version: 16
|
||||||
- name: install Rust stable
|
- name: install Rust stable
|
||||||
uses: dtolnay/rust-toolchain@stable
|
uses: dtolnay/rust-toolchain@stable
|
||||||
|
with:
|
||||||
|
targets: ${{ matrix.config.rust_target }}
|
||||||
|
- uses: Swatinem/rust-cache@v2
|
||||||
|
with:
|
||||||
|
key: ${{ matrix.config.rust_target }}
|
||||||
- name: install dependencies (ubuntu only)
|
- name: install dependencies (ubuntu only)
|
||||||
if: matrix.platform == 'ubuntu-20.04'
|
if: matrix.config.os == '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
|
||||||
|
@ -134,14 +134,19 @@ export function MaskConfig(props: {
|
|||||||
type="checkbox"
|
type="checkbox"
|
||||||
checked={props.mask.syncGlobalConfig}
|
checked={props.mask.syncGlobalConfig}
|
||||||
onChange={async (e) => {
|
onChange={async (e) => {
|
||||||
|
const checked = e.currentTarget.checked;
|
||||||
if (
|
if (
|
||||||
e.currentTarget.checked &&
|
checked &&
|
||||||
(await showConfirm(Locale.Mask.Config.Sync.Confirm))
|
(await showConfirm(Locale.Mask.Config.Sync.Confirm))
|
||||||
) {
|
) {
|
||||||
props.updateMask((mask) => {
|
props.updateMask((mask) => {
|
||||||
mask.syncGlobalConfig = e.currentTarget.checked;
|
mask.syncGlobalConfig = checked;
|
||||||
mask.modelConfig = { ...globalConfig.modelConfig };
|
mask.modelConfig = { ...globalConfig.modelConfig };
|
||||||
});
|
});
|
||||||
|
} else if (!checked) {
|
||||||
|
props.updateMask((mask) => {
|
||||||
|
mask.syncGlobalConfig = checked;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
></input>
|
></input>
|
||||||
|
@ -81,8 +81,7 @@ export const useUpdateStore = create<UpdateStore>()(
|
|||||||
|
|
||||||
set(() => ({ version }));
|
set(() => ({ version }));
|
||||||
|
|
||||||
const shouldCheck =
|
const shouldCheck = Date.now() - get().lastUpdate > 2 * 60 * ONE_MINUTE;
|
||||||
Date.now() - get().lastUpdate > 24 * 60 * ONE_MINUTE;
|
|
||||||
if (!force && !shouldCheck) return;
|
if (!force && !shouldCheck) return;
|
||||||
|
|
||||||
set(() => ({
|
set(() => ({
|
||||||
|
BIN
public/macos.png
Normal file
BIN
public/macos.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 26 KiB |
Binary file not shown.
Loading…
Reference in New Issue
Block a user