From 91b012a2ccc2ec80f67d1874459f695a1af2c0c7 Mon Sep 17 00:00:00 2001 From: eeee0717 Date: Sat, 14 Jun 2025 15:59:53 +0800 Subject: [PATCH] fix: skip canvas rebuild --- .github/workflows/release.yml | 42 ----------------------------------- electron-builder.yml | 2 ++ 2 files changed, 2 insertions(+), 42 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7b9f8b57e..5f6e02236 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -44,48 +44,6 @@ jobs: with: node-version: 20 - - name: macos-latest dependencies fix - if: matrix.os == 'macos-latest' - run: | - brew install pkg-config cairo pango libpng jpeg giflib librsvg pixman python-setuptools - echo "PKG_CONFIG_PATH=/opt/homebrew/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV - echo "LDFLAGS=-L/opt/homebrew/lib" >> $GITHUB_ENV - echo "CPPFLAGS=-I/opt/homebrew/include" >> $GITHUB_ENV - - - name: linux-latest dependencies fix - if: matrix.os == 'ubuntu-latest' - run: | - sudo apt-get update - sudo apt-get install -y build-essential libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev libpixman-1-dev - - - name: windows-latest dependencies fix - if: matrix.os == 'windows-latest' - shell: powershell - run: | - $gtkUrl = "https://ftp.gnome.org/pub/GNOME/binaries/win64/gtk+/2.22/gtk+-bundle_2.22.1-20101229_win64.zip" - $gtkZipPath = "C:\gtk-bundle.zip" - $gtkExtractPath = "C:\GTK_TEMP_EXTRACT" - $gtkInstallPath = "C:\GTK" - Invoke-WebRequest -Uri $gtkUrl -OutFile $gtkZipPath - New-Item -ItemType Directory -Force -Path $gtkExtractPath | Out-Null - Expand-Archive -Path $gtkZipPath -DestinationPath $gtkExtractPath -Force - - New-Item -ItemType Directory -Force -Path $gtkInstallPath | Out-Null - Move-Item -Path (Join-Path $gtkExtractPath "gtk\*") -Destination $gtkInstallPath -Force - - Remove-Item $gtkZipPath -Force - Remove-Item $gtkExtractPath -Recurse -Force - - Add-Content $env:GITHUB_PATH "C:\GTK\bin" - echo "PKG_CONFIG_PATH=C:\GTK\lib\pkgconfig" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - $env:PKG_CONFIG_PATH = "C:\GTK\lib\pkgconfig" - - echo "npm_config_gtk_root=C:\GTK" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - $env:npm_config_gtk_root = "C:\GTK" - - - name: Install corepack - run: corepack enable && corepack prepare yarn@4.6.0 --activate - - name: Get yarn cache directory path id: yarn-cache-dir-path run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT diff --git a/electron-builder.yml b/electron-builder.yml index dd52fc657..30d6f27f0 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -1,5 +1,7 @@ appId: com.kangfenmao.CherryStudio productName: Cherry Studio +excludeRebuildModules: + - 'canvas' electronLanguages: - zh-CN - zh-TW