From 056d310e20ab00414a474608ca290e2748855616 Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Wed, 29 Dec 2021 21:10:29 -0700 Subject: [PATCH] feat(ffmpeg): roll ffmpeg to 1007 (#11081) This build: - Includes a native build for Mac Arm64 - Changes executable name for the linux arm64 build --- .github/workflows/tests_primary.yml | 1 + packages/playwright-core/browsers.json | 2 +- packages/playwright-core/src/utils/registry.ts | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests_primary.yml b/.github/workflows/tests_primary.yml index 764194b4f4..4aa2e57c3b 100644 --- a/.github/workflows/tests_primary.yml +++ b/.github/workflows/tests_primary.yml @@ -9,6 +9,7 @@ on: paths-ignore: - 'browser_patches/**' - 'docs/**' + types: [ labeled ] branches: - main - release-* diff --git a/packages/playwright-core/browsers.json b/packages/playwright-core/browsers.json index 2a453116f4..4c18ae1f42 100644 --- a/packages/playwright-core/browsers.json +++ b/packages/playwright-core/browsers.json @@ -31,7 +31,7 @@ }, { "name": "ffmpeg", - "revision": "1006", + "revision": "1007", "installByDefault": true } ] diff --git a/packages/playwright-core/src/utils/registry.ts b/packages/playwright-core/src/utils/registry.ts index fa5964b304..ff040728b4 100644 --- a/packages/playwright-core/src/utils/registry.ts +++ b/packages/playwright-core/src/utils/registry.ts @@ -68,8 +68,8 @@ const EXECUTABLE_PATHS = { 'ffmpeg': { 'ubuntu18.04': ['ffmpeg-linux'], 'ubuntu20.04': ['ffmpeg-linux'], - 'ubuntu18.04-arm64': ['ffmpeg-linux-arm64'], - 'ubuntu20.04-arm64': ['ffmpeg-linux-arm64'], + 'ubuntu18.04-arm64': ['ffmpeg-linux'], + 'ubuntu20.04-arm64': ['ffmpeg-linux'], 'mac10.13': ['ffmpeg-mac'], 'mac10.14': ['ffmpeg-mac'], 'mac10.15': ['ffmpeg-mac'], @@ -149,7 +149,7 @@ const DOWNLOAD_PATHS = { 'mac10.14': 'builds/ffmpeg/%s/ffmpeg-mac.zip', 'mac10.15': 'builds/ffmpeg/%s/ffmpeg-mac.zip', 'mac11': 'builds/ffmpeg/%s/ffmpeg-mac.zip', - 'mac11-arm64': 'builds/ffmpeg/%s/ffmpeg-mac.zip', + 'mac11-arm64': 'builds/ffmpeg/%s/ffmpeg-mac-arm64.zip', 'win64': 'builds/ffmpeg/%s/ffmpeg-win64.zip', }, };