mirror of
https://github.com/fromchat-messenger/app.git
synced 2026-09-22 19:15:05 +03:00
Fix macOS DMG Playwright install and rename release CI jobs.
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -31,6 +31,7 @@ env:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
resolve-version:
|
resolve-version:
|
||||||
|
name: Resolve version
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
outputs:
|
outputs:
|
||||||
version: ${{ steps.ver.outputs.version }}
|
version: ${{ steps.ver.outputs.version }}
|
||||||
@@ -57,6 +58,7 @@ jobs:
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
desktop-proguard:
|
desktop-proguard:
|
||||||
|
name: Build JAR
|
||||||
needs: resolve-version
|
needs: resolve-version
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
timeout-minutes: 45
|
timeout-minutes: 45
|
||||||
@@ -81,6 +83,7 @@ jobs:
|
|||||||
retention-days: 3
|
retention-days: 3
|
||||||
|
|
||||||
windows-common:
|
windows-common:
|
||||||
|
name: Windows installer
|
||||||
needs: resolve-version
|
needs: resolve-version
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
timeout-minutes: 30
|
timeout-minutes: 30
|
||||||
@@ -116,6 +119,7 @@ jobs:
|
|||||||
retention-days: 3
|
retention-days: 3
|
||||||
|
|
||||||
windows-package:
|
windows-package:
|
||||||
|
name: Windows (${{ matrix.arch == 'arm64' && 'ARM' || 'x64' }})
|
||||||
needs: [resolve-version, desktop-proguard, windows-common]
|
needs: [resolve-version, desktop-proguard, windows-common]
|
||||||
env:
|
env:
|
||||||
FROMCHAT_PREBUILT_PROGUARD: "1"
|
FROMCHAT_PREBUILT_PROGUARD: "1"
|
||||||
@@ -177,6 +181,7 @@ jobs:
|
|||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
|
|
||||||
macos:
|
macos:
|
||||||
|
name: macOS (${{ matrix.arch == 'arm64' && 'Apple Silicon' || 'Intel' }})
|
||||||
needs: [resolve-version, desktop-proguard]
|
needs: [resolve-version, desktop-proguard]
|
||||||
env:
|
env:
|
||||||
FROMCHAT_PREBUILT_PROGUARD: "1"
|
FROMCHAT_PREBUILT_PROGUARD: "1"
|
||||||
@@ -209,8 +214,8 @@ jobs:
|
|||||||
path: |
|
path: |
|
||||||
app/desktop/dmg-background/node_modules
|
app/desktop/dmg-background/node_modules
|
||||||
~/.cache/ms-playwright
|
~/.cache/ms-playwright
|
||||||
key: dmg-tools-${{ hashFiles('app/desktop/dmg-background/package-lock.json') }}
|
key: dmg-tools-${{ runner.arch }}-${{ hashFiles('app/desktop/dmg-background/package-lock.json') }}
|
||||||
restore-keys: dmg-tools-
|
restore-keys: dmg-tools-${{ runner.arch }}-
|
||||||
- name: Install macOS packaging tools
|
- name: Install macOS packaging tools
|
||||||
run: |
|
run: |
|
||||||
if ! command -v create-dmg >/dev/null 2>&1; then
|
if ! command -v create-dmg >/dev/null 2>&1; then
|
||||||
@@ -219,8 +224,8 @@ jobs:
|
|||||||
DMG_DIR="app/desktop/dmg-background"
|
DMG_DIR="app/desktop/dmg-background"
|
||||||
if [[ ! -f "$DMG_DIR/node_modules/playwright/package.json" ]]; then
|
if [[ ! -f "$DMG_DIR/node_modules/playwright/package.json" ]]; then
|
||||||
npm --prefix "$DMG_DIR" ci --no-fund --no-audit
|
npm --prefix "$DMG_DIR" ci --no-fund --no-audit
|
||||||
npm --prefix "$DMG_DIR" exec playwright install chromium
|
|
||||||
fi
|
fi
|
||||||
|
npm --prefix "$DMG_DIR" exec playwright install chromium
|
||||||
- name: Package macOS ${{ matrix.arch }}
|
- name: Package macOS ${{ matrix.arch }}
|
||||||
run: |
|
run: |
|
||||||
export FROMCHAT_PACKAGING_JDK="$JAVA_HOME"
|
export FROMCHAT_PACKAGING_JDK="$JAVA_HOME"
|
||||||
@@ -232,6 +237,7 @@ jobs:
|
|||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
|
|
||||||
linux:
|
linux:
|
||||||
|
name: Linux (${{ matrix.arch == 'arm64' && 'ARM' || 'x64' }})
|
||||||
needs: [resolve-version, desktop-proguard]
|
needs: [resolve-version, desktop-proguard]
|
||||||
env:
|
env:
|
||||||
FROMCHAT_PREBUILT_PROGUARD: "1"
|
FROMCHAT_PREBUILT_PROGUARD: "1"
|
||||||
@@ -284,6 +290,7 @@ jobs:
|
|||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
|
|
||||||
android:
|
android:
|
||||||
|
name: Android
|
||||||
needs: resolve-version
|
needs: resolve-version
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
timeout-minutes: 60
|
timeout-minutes: 60
|
||||||
|
|||||||
@@ -602,8 +602,8 @@ val installDmgBackgroundTools = tasks.register<Exec>("installDmgBackgroundTools"
|
|||||||
"""
|
"""
|
||||||
if [ ! -f node_modules/playwright/package.json ]; then
|
if [ ! -f node_modules/playwright/package.json ]; then
|
||||||
npm install --no-fund --no-audit
|
npm install --no-fund --no-audit
|
||||||
npx playwright install chromium
|
|
||||||
fi
|
fi
|
||||||
|
npx playwright install chromium
|
||||||
""".trimIndent(),
|
""".trimIndent(),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user