Merge pull request #1 from ShintoKosei/main

Update um-react to d91e2

.github/workflows/build-electron.yml

@@ -35,12 +35,22 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4.1.1
+        with:
+          ref: ${{ inputs.commit || github.sha }}
 
+      # 关键修改：补充编译依赖
       - name: Install system dependencies
         run: |
           sudo dpkg --add-architecture i386
           sudo apt-get update
-          sudo apt-get install npm wine32
+          sudo apt-get install -y \
+            npm \
+            wine32 \
+            build-essential \
+            python3 \
+            libxi-dev \
+            libgl1-mesa-dev \
+            libpng-dev
 
       - name: Install pnpm
         uses: pnpm/action-setup@v2
@@ -51,7 +61,7 @@ jobs:
         run: |
           git submodule update --init --recursive
           cd um-react
-          pnpm install --frozen-lockfile
+          pnpm install --no-frozen-lockfile
           cd ..
           npm install --frozen-lockfile
 
@@ -88,8 +98,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4.1.1
 
+      # macOS 补充依赖
       - name: Install system dependencies
-        run: brew install node
+        run: |
+          brew install node
+          brew install pkg-config cairo pango libpng jpeg giflib
 
       - name: Install pnpm
         uses: pnpm/action-setup@v2
@@ -100,7 +113,7 @@ jobs:
         run: |
           git submodule update --init --recursive
           cd um-react
-          pnpm install --frozen-lockfile
+          pnpm install --no-frozen-lockfile
           cd ..
           npm install --frozen-lockfile
 

um-react

@@ -1 +1 @@
-Subproject commit e9a95d1bd63142fd693ae9fafa1126926e7ac8cd
+Subproject commit d91e2fffe4747da635d4d82579205a0e8a8a298e