From 3fe8923fc3496537fb52e49e70ce0e1e99fd2832 Mon Sep 17 00:00:00 2001 From: DarkSky <25152247+darkskygit@users.noreply.github.com> Date: Fri, 26 Dec 2025 23:37:53 +0800 Subject: [PATCH] fix: flatpak bundle (#14155) --- .github/workflows/release-desktop.yml | 9 +++++++++ packages/frontend/apps/electron/forge.config.mjs | 9 ++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-desktop.yml b/.github/workflows/release-desktop.yml index 2820bba2c2..9c2249ef1d 100644 --- a/.github/workflows/release-desktop.yml +++ b/.github/workflows/release-desktop.yml @@ -128,17 +128,26 @@ jobs: - name: Install additional dependencies on Linux if: ${{ matrix.spec.platform == 'linux' }} run: | + df -h sudo add-apt-repository universe sudo apt install -y libfuse2 elfutils flatpak flatpak-builder flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo flatpak update # some flatpak deps need git protocol.file.allow git config --global protocol.file.allow always + # clean up apt cache to save disk space + sudo -E apt-get -y purge azure-cli* zulu* hhvm* llvm* firefox* google* dotnet* aspnetcore* powershell* adoptopenjdk* mysql* php* mongodb* moby* snap* || true + sudo -E apt-get -qq autoremove --purge + sudo rm -rf /usr/share/dotnet /opt/ghc /opt/hostedtoolcache/CodeQL /usr/local/lib/android + sudo apt-get clean + rm -rf ~/.cache/yarn ~/.npm + df -h - name: Remove nbstore node_modules shell: bash # node_modules of nbstore is not needed for building, and it will make the build process out of memory run: | + cargo clean rm -rf packages/frontend/apps/electron/node_modules/@affine/nbstore/node_modules/@blocksuite rm -rf packages/frontend/apps/electron/node_modules/@affine/native/node_modules diff --git a/packages/frontend/apps/electron/forge.config.mjs b/packages/frontend/apps/electron/forge.config.mjs index 00937fce05..6fb54ee779 100644 --- a/packages/frontend/apps/electron/forge.config.mjs +++ b/packages/frontend/apps/electron/forge.config.mjs @@ -12,8 +12,8 @@ import { arch, buildType, icnsPath, - iconPngPath, iconUrl, + iconX64PngPath, iconX512PngPath, icoPath, platform, @@ -120,8 +120,11 @@ const makers = [ mimeType: linuxMimeTypes, productName, bin: productName, - id: appIdMap[buildType], - icon: iconPngPath, // not working yet + id: fromBuildIdentifier(appIdMap), + icon: { + '64x64': iconX64PngPath, + '512x512': iconX512PngPath, + }, branch: buildType, runtime: 'org.freedesktop.Platform', runtimeVersion: '25.08',