From f8db6756c7e807b30cdbf93ab8135fd1193b7bc2 Mon Sep 17 00:00:00 2001
From: denis0001-dev <denis0001.dev@ya.ru>
Date: Mon, 14 Sep 2026 00:40:40 +0300
Subject: [PATCH] Fix macOS DMG Playwright install and rename release CI jobs.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .github/workflows/release.yml | 13 ++++++++++---
 app/desktop/build.gradle.kts  |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c0dbdc7..bf317ed 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,6 +31,7 @@ env:
 
 jobs:
   resolve-version:
+    name: Resolve version
     runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.ver.outputs.version }}
@@ -57,6 +58,7 @@ jobs:
           esac
 
   desktop-proguard:
+    name: Build JAR
     needs: resolve-version
     runs-on: ubuntu-latest
     timeout-minutes: 45
@@ -81,6 +83,7 @@ jobs:
           retention-days: 3
 
   windows-common:
+    name: Windows installer
     needs: resolve-version
     runs-on: windows-latest
     timeout-minutes: 30
@@ -116,6 +119,7 @@ jobs:
           retention-days: 3
 
   windows-package:
+    name: Windows (${{ matrix.arch == 'arm64' && 'ARM' || 'x64' }})
     needs: [resolve-version, desktop-proguard, windows-common]
     env:
       FROMCHAT_PREBUILT_PROGUARD: "1"
@@ -177,6 +181,7 @@ jobs:
           if-no-files-found: error
 
   macos:
+    name: macOS (${{ matrix.arch == 'arm64' && 'Apple Silicon' || 'Intel' }})
     needs: [resolve-version, desktop-proguard]
     env:
       FROMCHAT_PREBUILT_PROGUARD: "1"
@@ -209,8 +214,8 @@ jobs:
           path: |
             app/desktop/dmg-background/node_modules
             ~/.cache/ms-playwright
-          key: dmg-tools-${{ hashFiles('app/desktop/dmg-background/package-lock.json') }}
-          restore-keys: dmg-tools-
+          key: dmg-tools-${{ runner.arch }}-${{ hashFiles('app/desktop/dmg-background/package-lock.json') }}
+          restore-keys: dmg-tools-${{ runner.arch }}-
       - name: Install macOS packaging tools
         run: |
           if ! command -v create-dmg >/dev/null 2>&1; then
@@ -219,8 +224,8 @@ jobs:
           DMG_DIR="app/desktop/dmg-background"
           if [[ ! -f "$DMG_DIR/node_modules/playwright/package.json" ]]; then
             npm --prefix "$DMG_DIR" ci --no-fund --no-audit
-            npm --prefix "$DMG_DIR" exec playwright install chromium
           fi
+          npm --prefix "$DMG_DIR" exec playwright install chromium
       - name: Package macOS ${{ matrix.arch }}
         run: |
           export FROMCHAT_PACKAGING_JDK="$JAVA_HOME"
@@ -232,6 +237,7 @@ jobs:
           if-no-files-found: error
 
   linux:
+    name: Linux (${{ matrix.arch == 'arm64' && 'ARM' || 'x64' }})
     needs: [resolve-version, desktop-proguard]
     env:
       FROMCHAT_PREBUILT_PROGUARD: "1"
@@ -284,6 +290,7 @@ jobs:
           if-no-files-found: error
 
   android:
+    name: Android
     needs: resolve-version
     runs-on: ubuntu-latest
     timeout-minutes: 60
diff --git a/app/desktop/build.gradle.kts b/app/desktop/build.gradle.kts
index 6b4581d..aacb570 100644
--- a/app/desktop/build.gradle.kts
+++ b/app/desktop/build.gradle.kts
@@ -602,8 +602,8 @@ val installDmgBackgroundTools = tasks.register<Exec>("installDmgBackgroundTools"
         """
         if [ ! -f node_modules/playwright/package.json ]; then
           npm install --no-fund --no-audit
-          npx playwright install chromium
         fi
+        npx playwright install chromium
         """.trimIndent(),
     )
 }