From 5c3a75044265be896873fd4ad3bed3ec874202af Mon Sep 17 00:00:00 2001 From: an-lee Date: Fri, 1 Mar 2024 15:23:25 +0800 Subject: [PATCH] fix build arm64 in x64 runner --- .github/workflows/build-enjoy-app.yml | 4 ++++ enjoy/src/renderer/context/app-settings-provider.tsx | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-enjoy-app.yml b/.github/workflows/build-enjoy-app.yml index a3e315de..8960f392 100644 --- a/.github/workflows/build-enjoy-app.yml +++ b/.github/workflows/build-enjoy-app.yml @@ -39,6 +39,10 @@ jobs: key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }} - name: Install dependencies + env: + # It will build arm64 version in x64 runner + # This env help ffmpeg/ffprobe-static to install the right binary + npm_config_arch: ${{ github.event.inputs.arch }} run: yarn install - name: Install Apple certificate diff --git a/enjoy/src/renderer/context/app-settings-provider.tsx b/enjoy/src/renderer/context/app-settings-provider.tsx index cdc7f5dc..d8b0e293 100644 --- a/enjoy/src/renderer/context/app-settings-provider.tsx +++ b/enjoy/src/renderer/context/app-settings-provider.tsx @@ -82,9 +82,7 @@ export const AppSettingsProvider = ({ const valid = await EnjoyApp.ffmpeg.check(); setFfmpegValid(valid); - if (!valid) { - loadFfmpegWASM(); - } + loadFfmpegWASM(); }; const loadFfmpegWASM = async () => { @@ -113,6 +111,7 @@ export const AppSettingsProvider = ({ workerURL, }); setFfmpegWasm(ffmpegRef.current); + (window as any).ffmpeg = ffmpegRef.current; } catch (err) { toast.error(err.message); }