Skip to content

Commit

Permalink
Merge branch 'master' into KIT-3774
Browse files Browse the repository at this point in the history
  • Loading branch information
fpbrault committed Jan 13, 2025
2 parents 0a24fe1 + db77dd0 commit 6a151c3
Show file tree
Hide file tree
Showing 107 changed files with 40,911 additions and 49,625 deletions.
24 changes: 10 additions & 14 deletions .github/actions/e2e-atomic-react/action.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Atomic React E2E tests'
description: 'Runs Cypress tests for Atomic React'
name: 'Playwright Atomic React'
description: 'Runs Playwright tests for Atomic React'
inputs:
github-token:
description: The GitHub token for accurately detecting a build vs a re-run build
Expand All @@ -8,20 +8,16 @@ inputs:
runs:
using: composite
steps:
- run: npx cypress install
- name: Install Playwright Browsers
run: npx playwright install --with-deps
working-directory: packages/samples/angular
shell: bash
- name: Run Playwright tests
run: npx playwright test
working-directory: packages/samples/atomic-react
shell: bash
- uses: cypress-io/github-action@v5
name: Run Cypress
with:
browser: chrome
command-prefix: 'npx -w @coveo/atomic-react-samples cypress-repeat run -n 3 --until-passes --rerun-failed-only --'
start: npx nx run atomic-react-samples:dev
wait-on: 'http://localhost:3000'
wait-on-timeout: 600000
install: false
record: false
- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
if: failure()
with:
name: react-screenshots
path: packages/samples/atomic-react/cypress/screenshots
path: packages/samples/atomic-react/playwright-report/
2 changes: 1 addition & 1 deletion .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ runs:
run: echo "NX_REJECT_UNKNOWN_LOCAL_CACHE=0" >> $GITHUB_ENV
shell: bash
- name: Install npm
run: npm i -g npm@10
run: npm i -g npm@11
shell: bash
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
id: npm-cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/masterbot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
registry-url: 'https://registry.npmjs.org'
node-version-file: '.nvmrc'
- name: Install npm
run: npm i -g npm@10
run: npm i -g npm@11
shell: bash
- run: npm ci
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ jobs:
echo "version=$VERSION" >> $GITHUB_ENV
- name: Zip documentation folder
run: |
DOCS_DIR="packages/headless/docs"
DOCS_DIR="packages/headless-react/docs"
if [ ! -d "$DOCS_DIR" ]; then
echo "Documentation folder $DOCS_DIR not found."
exit 1
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ packages/atomic/src/external-builds/**/*
packages/atomic/src/generated/**
packages/headless/src/external-builds/**/*
packages/quantic/docs/out/quantic-docs.json
packages/quantic/.tmp/**
packages/samples/headless-react/build/**/*
packages/samples/headless-commerce-ssr-remix/build/**/*
packages/samples/angular/src/lang/*.json
Expand Down
3 changes: 2 additions & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,5 +131,6 @@
},
"defaultBase": "master",
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"useInferencePlugins": false
"useInferencePlugins": false,
"useLegacyCache": true
}
Loading

0 comments on commit 6a151c3

Please sign in to comment.