diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml index 8fd2bce3..f8217c37 100644 --- a/.github/workflows/artifacts.yml +++ b/.github/workflows/artifacts.yml @@ -17,8 +17,9 @@ jobs: target: x86_64-apple-darwin - os: windows-2022 target: x86_64-pc-windows-msvc - - os: ubuntu-20.04 - target: x86_64-unknown-linux-gnu + # # Re-enable Linux when context menu is supported + # - os: ubuntu-20.04 + # target: x86_64-unknown-linux-gnu runs-on: ${{ matrix.os }} diff --git a/src-tauri/src/updates.rs b/src-tauri/src/updates.rs index 43cad3f1..ac2dd53a 100644 --- a/src-tauri/src/updates.rs +++ b/src-tauri/src/updates.rs @@ -41,7 +41,7 @@ impl YaakUpdater { if dialog::blocking::ask( None::<&Window>, "Update available", - "An update is available. Would you like to download and install it now?", + format!("{} is available. Would you like to download and install it now?", update.latest_version()), ) { _ = update.download_and_install().await; } diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 77c4d039..b7ba5b33 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "Yaak", - "version": "2023.3.0-beta.1" + "version": "2023.3.0-beta.2" }, "tauri": { "windows": [], diff --git a/src-web/components/WorkspaceActionsDropdown.tsx b/src-web/components/WorkspaceActionsDropdown.tsx index c777cc2c..d07f83b6 100644 --- a/src-web/components/WorkspaceActionsDropdown.tsx +++ b/src-web/components/WorkspaceActionsDropdown.tsx @@ -3,6 +3,7 @@ import classNames from 'classnames'; import { memo, useMemo } from 'react'; import { useActiveWorkspace } from '../hooks/useActiveWorkspace'; import { useAppRoutes } from '../hooks/useAppRoutes'; +import { useAppVersion } from '../hooks/useAppVersion'; import { useCreateWorkspace } from '../hooks/useCreateWorkspace'; import { useDeleteWorkspace } from '../hooks/useDeleteWorkspace'; import { useExportData } from '../hooks/useExportData'; @@ -40,6 +41,7 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({ const dialog = useDialog(); const prompt = usePrompt(); const routes = useAppRoutes(); + const appVersion = useAppVersion(); const [updateMode, setUpdateMode] = useUpdateMode(); const items: DropdownItem[] = useMemo(() => { @@ -159,7 +161,7 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({ leftSlot: , onSelect: () => exportData.mutate(), }, - { type: 'separator' }, + { type: 'separator', label: `v${appVersion.data}` }, { key: 'appearance', label: 'Toggle Theme', diff --git a/src-web/hooks/useAppVersion.ts b/src-web/hooks/useAppVersion.ts new file mode 100644 index 00000000..ae3a9518 --- /dev/null +++ b/src-web/hooks/useAppVersion.ts @@ -0,0 +1,6 @@ +import { useQuery } from '@tanstack/react-query'; +import { getVersion } from '@tauri-apps/api/app'; + +export function useAppVersion() { + return useQuery(['appVersion'], getVersion); +}