Skip to content

Commit

Permalink
Merge pull request ChatGPTNextWeb#2213 from Yidadaa/bugfix-0701
Browse files Browse the repository at this point in the history
feat: mac os arm64 bundle
  • Loading branch information
Yidadaa authored Jul 1, 2023
2 parents 4641966 + c358823 commit 3428b61
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 7 deletions.
23 changes: 20 additions & 3 deletions .github/workflows/app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,21 @@ jobs:
strategy:
fail-fast: false
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:
- uses: actions/checkout@v3
- name: setup node
Expand All @@ -50,8 +62,13 @@ jobs:
node-version: 16
- name: install Rust 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)
if: matrix.platform == 'ubuntu-20.04'
if: matrix.config.os == '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
Expand Down
9 changes: 7 additions & 2 deletions app/components/mask.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -134,14 +134,19 @@ export function MaskConfig(props: {
type="checkbox"
checked={props.mask.syncGlobalConfig}
onChange={async (e) => {
const checked = e.currentTarget.checked;
if (
e.currentTarget.checked &&
checked &&
(await showConfirm(Locale.Mask.Config.Sync.Confirm))
) {
props.updateMask((mask) => {
mask.syncGlobalConfig = e.currentTarget.checked;
mask.syncGlobalConfig = checked;
mask.modelConfig = { ...globalConfig.modelConfig };
});
} else if (!checked) {
props.updateMask((mask) => {
mask.syncGlobalConfig = checked;
});
}
}}
></input>
Expand Down
3 changes: 1 addition & 2 deletions app/store/update.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ export const useUpdateStore = create<UpdateStore>()(

set(() => ({ version }));

const shouldCheck =
Date.now() - get().lastUpdate > 24 * 60 * ONE_MINUTE;
const shouldCheck = Date.now() - get().lastUpdate > 2 * 60 * ONE_MINUTE;
if (!force && !shouldCheck) return;

set(() => ({
Expand Down
Binary file added public/macos.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src-tauri/icons/icon.icns
Binary file not shown.

0 comments on commit 3428b61

Please sign in to comment.