diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 76b60ceb37c..0c572a4fb61 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -41,10 +41,6 @@ jobs: with: cache: npm node-version-file: '.nvmrc' - - name: Set up FFmpeg - uses: FedericoCarboni/setup-ffmpeg@37062fbf7149fc5578d6c57e08aed62458b375d6 # v3.1.0 - with: - ffmpeg-version: 6.1 - name: Install dependencies run: npm ci env: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2a4f3f6931c..d84c5b9377b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -183,10 +183,6 @@ jobs: with: cache: npm node-version-file: '.nvmrc' - - name: Set up FFmpeg - uses: FedericoCarboni/setup-ffmpeg@37062fbf7149fc5578d6c57e08aed62458b375d6 # v3.1.0 - with: - ffmpeg-version: 6.1 - name: Install dependencies run: npm ci env: @@ -285,10 +281,6 @@ jobs: with: cache: npm node-version-file: '.nvmrc' - - name: Set up FFmpeg - uses: FedericoCarboni/setup-ffmpeg@37062fbf7149fc5578d6c57e08aed62458b375d6 # v3.1.0 - with: - ffmpeg-version: 6.1 - name: Install dependencies run: npm ci env: diff --git a/.github/workflows/deflake.yml b/.github/workflows/deflake.yml index 78e7e7b5dde..450a1237dff 100644 --- a/.github/workflows/deflake.yml +++ b/.github/workflows/deflake.yml @@ -55,10 +55,6 @@ jobs: with: cache: npm node-version-file: '.nvmrc' - - name: Set up FFmpeg - uses: FedericoCarboni/setup-ffmpeg@37062fbf7149fc5578d6c57e08aed62458b375d6 # v3.1.0 - with: - ffmpeg-version: 6.1 - name: Install dependencies run: npm ci env: @@ -114,10 +110,6 @@ jobs: with: cache: npm node-version-file: '.nvmrc' - - name: Set up FFmpeg - uses: FedericoCarboni/setup-ffmpeg@37062fbf7149fc5578d6c57e08aed62458b375d6 # v3.1.0 - with: - ffmpeg-version: 6.1 - name: Install dependencies run: npm ci env: diff --git a/test/TestExpectations.json b/test/TestExpectations.json index fd7046cb394..24a1fea0250 100644 --- a/test/TestExpectations.json +++ b/test/TestExpectations.json @@ -188,12 +188,19 @@ "expectations": ["SKIP"], "comment": "TODO: add a comment explaining why this expectation is required (include links to issues)" }, + { + "testIdPattern": "[screencast.spec] *", + "platforms": ["darwin", "linux", "win32"], + "parameters": ["chrome"], + "expectations": ["SKIP"], + "comment": "Currently no reliable ffmpeg downloads for testing https://github.com/puppeteer/puppeteer/issues/12121" + }, { "testIdPattern": "[screencast.spec] *", "platforms": ["darwin", "linux", "win32"], "parameters": ["firefox"], "expectations": ["SKIP"], - "comment": "TODO: add a comment explaining why this expectation is required (include links to issues)" + "comment": "CDP-specific feature" }, { "testIdPattern": "[screenshot.spec] Screenshots Cdp *", @@ -756,6 +763,13 @@ "expectations": ["SKIP"], "comment": "TODO: add a comment explaining why this expectation is required (include links to issues)" }, + { + "testIdPattern": "[prerender.spec] Prerender can screencast", + "platforms": ["darwin", "linux", "win32"], + "parameters": ["chrome"], + "expectations": ["SKIP"], + "comment": "Currently no reliable ffmpeg downloads for testing https://github.com/puppeteer/puppeteer/issues/12121" + }, { "testIdPattern": "[prerender.spec] Prerender can screencast", "platforms": ["darwin", "linux", "win32"],