Skip to content

Commit 5cc9533

Browse files
Merge branch 'master' into dependabot/npm_and_yarn/react-webpack-host-vite-remote/form-data-4.0.4
2 parents a964ab3 + 3a8d4fe commit 5cc9533

24 files changed

+1379
-386
lines changed

.github/workflows/on-pull-request.yml

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -264,22 +264,23 @@ jobs:
264264
npx cypress verify || true
265265
fi
266266
267-
- name: Install Playwright for projects that need it
267+
- name: Install Playwright browsers for projects that use it
268268
run: |
269-
if [ "${{ matrix.container }}" = "bi-directional" ]; then
270-
echo "Setting up Playwright for bi-directional example..."
271-
cd ${{ matrix.container }}
272-
273-
# Check if we need to install Playwright browsers
274-
if [ ! -d "$HOME/.cache/ms-playwright" ] || [ -z "$(ls -A $HOME/.cache/ms-playwright 2>/dev/null)" ]; then
275-
echo "Installing Playwright browsers and dependencies..."
276-
npx playwright install --with-deps chromium
277-
else
278-
echo "Playwright browsers already cached, installing system dependencies only..."
279-
npx playwright install-deps chromium
280-
fi
281-
282-
cd ..
269+
echo "Installing Playwright browsers for projects that use it..."
270+
271+
# Install Playwright package first if not already available
272+
if ! command -v playwright &> /dev/null; then
273+
echo "Installing Playwright package..."
274+
npm install -g playwright@^1.54.2
275+
fi
276+
277+
# Check if we need to install Playwright browsers
278+
if [ ! -d "$HOME/.cache/ms-playwright" ] || [ -z "$(ls -A $HOME/.cache/ms-playwright 2>/dev/null)" ]; then
279+
echo "Installing Playwright browsers and dependencies..."
280+
npx playwright install --with-deps chromium
281+
else
282+
echo "Playwright browsers already cached, installing system dependencies only..."
283+
npx playwright install-deps chromium
283284
fi
284285
285286
- name: Run sample webpack e2e tests
@@ -298,11 +299,14 @@ jobs:
298299
pnpm --filter "${{ matrix.container }}" e2e:ci
299300
(lsof -i tcp:3000-3999 -i tcp:4000-4999 -i tcp:8080-8100 | awk 'NR!=1 {print $2}' | xargs -r kill) 2> /dev/null
300301
301-
- name: Create artifacts for Allure report
302-
id: create-artifacts-allure-report
302+
- name: Create artifacts for test reports
303+
id: create-artifacts-test-reports
303304
uses: actions/upload-artifact@v4
304305
if: always()
305306
with:
306-
name: allure-results
307-
path: 'cypress/results/allure-results'
307+
name: test-results-${{ matrix.container }}
308+
path: |
309+
${{ matrix.container }}/cypress/results/allure-results
310+
${{ matrix.container }}/playwright-report
311+
${{ matrix.container }}/test-results
308312
retention-days: 7

0 commit comments

Comments
 (0)