From 9082693af388901169f06b7fb7bb1516b2081972 Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Fri, 11 Apr 2025 14:00:09 -0400 Subject: [PATCH 1/3] build: use playwright ffmpeg --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7a8c252845dae..806f8a57b6401 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -113,8 +113,11 @@ commands: condition: << parameters.playwright >> steps: - run: - name: Install playwright - command: pnpx playwright@1.51.1 install --with-deps + name: Install playwright & ffmpeg + command: | + pnpx playwright@1.51.1 install --with-deps + # Avoids installing a system version of ffmpeg + ln -s ~/.cache/ms-playwright/ffmpeg-1011 ~/bin/ffmpeg jobs: checkout: @@ -293,9 +296,6 @@ jobs: - install_js: playwright: true react-version: << parameters.react-version >> - - run: - name: Install ffmpeg - command: sudo apt update && sudo apt upgrade -y && sudo apt install ffmpeg -y - run: name: Run visual regression tests command: xvfb-run pnpm test:regressions From cd9bdd160cd37d31db83dff00b6d92730ce25e54 Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Sat, 12 Apr 2025 13:40:57 -0400 Subject: [PATCH 2/3] lint --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 806f8a57b6401..fd2e0b1ceb89f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -117,7 +117,9 @@ commands: command: | pnpx playwright@1.51.1 install --with-deps # Avoids installing a system version of ffmpeg - ln -s ~/.cache/ms-playwright/ffmpeg-1011 ~/bin/ffmpeg + ffmpeg_bin=$(find ~/.cache/ms-playwright -regex '.*/ffmpeg-[0-9]*') + echo "Using $ffmpeg_bin" + ln -s "$ffmpeg_bin" ~/bin/ffmpeg jobs: checkout: From fd82590f477be0599ccda31b197d8e7237fa24d4 Mon Sep 17 00:00:00 2001 From: Rom Grk Date: Sat, 12 Apr 2025 15:21:58 -0400 Subject: [PATCH 3/3] lint --- .circleci/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fd2e0b1ceb89f..64734f1067d7e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -118,7 +118,10 @@ commands: pnpx playwright@1.51.1 install --with-deps # Avoids installing a system version of ffmpeg ffmpeg_bin=$(find ~/.cache/ms-playwright -regex '.*/ffmpeg-[0-9]*') - echo "Using $ffmpeg_bin" + if [[ -z "$ffmpeg_bin" ]]; then + >&2 echo "Could not find ffmpeg location" + exit 1 + fi ln -s "$ffmpeg_bin" ~/bin/ffmpeg jobs: