Skip to content

Commit

Permalink
Merge branch 'master' into ssr-recs
Browse files Browse the repository at this point in the history
  • Loading branch information
alexprudhomme authored Nov 22, 2024
2 parents 3f93d51 + 4ccf316 commit 93b3967
Show file tree
Hide file tree
Showing 152 changed files with 3,973 additions and 786 deletions.
45 changes: 43 additions & 2 deletions .deployment.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
{
"id": "deploy-bueno-patch-to-s3-version",
"s3": {
"disabled": $[IS_NIGHTLY],
"bucket": "{terraform.infra.infra.bucket_binaries}",
"directory": "proda/StaticCDN/bueno/v$[BUENO_PATCH_VERSION]",
"source": "packages/bueno/dist/browser",
Expand All @@ -29,6 +30,7 @@
{
"id": "deploy-bueno-minor-to-s3-version",
"s3": {
"disabled": $[IS_NIGHTLY],
"bucket": "{terraform.infra.infra.bucket_binaries}",
"directory": "proda/StaticCDN/bueno/v$[BUENO_MINOR_VERSION]",
"source": "packages/bueno/dist/browser",
Expand All @@ -40,6 +42,7 @@
{
"id": "deploy-bueno-major-to-s3-version",
"s3": {
"disabled": $[IS_NIGHTLY],
"bucket": "{terraform.infra.infra.bucket_binaries}",
"directory": "proda/StaticCDN/bueno/v$[BUENO_MAJOR_VERSION]",
"source": "packages/bueno/dist/browser",
Expand All @@ -48,9 +51,22 @@
}
}
},
{
"id": "deploy-bueno-nightly-to-s3-version",
"s3": {
"disabled": $[IS_NOT_NIGHTLY],
"bucket": "{terraform.infra.infra.bucket_binaries}",
"directory": "proda/StaticCDN/bueno/v$[BUENO_MAJOR_VERSION]-nightly",
"source": "packages/bueno/dist/browser",
"parameters": {
"acl": "public-read"
}
}
},
{
"id": "deploy-headless-patch-to-s3-version",
"s3": {
"disabled": $[IS_NIGHTLY],
"bucket": "{terraform.infra.infra.bucket_binaries}",
"directory": "proda/StaticCDN/headless/v$[HEADLESS_PATCH_VERSION]",
"source": "packages/headless/dist/browser",
Expand All @@ -62,6 +78,7 @@
{
"id": "deploy-headless-minor-to-s3-version",
"s3": {
"disabled": $[IS_NIGHTLY],
"bucket": "{terraform.infra.infra.bucket_binaries}",
"directory": "proda/StaticCDN/headless/v$[HEADLESS_MINOR_VERSION]",
"source": "packages/headless/dist/browser",
Expand All @@ -73,6 +90,7 @@
{
"id": "deploy-headless-major-to-s3-version",
"s3": {
"disabled": $[IS_NIGHTLY],
"bucket": "{terraform.infra.infra.bucket_binaries}",
"directory": "proda/StaticCDN/headless/v$[HEADLESS_MAJOR_VERSION]",
"source": "packages/headless/dist/browser",
Expand All @@ -81,9 +99,22 @@
}
}
},
{
"id": "deploy-headless-nightly-to-s3-version",
"s3": {
"disabled": $[IS_NOT_NIGHTLY],
"bucket": "{terraform.infra.infra.bucket_binaries}",
"directory": "proda/StaticCDN/headless/v$[HEADLESS_MAJOR_VERSION]-nightly",
"source": "packages/headless/dist/browser",
"parameters": {
"acl": "public-read"
}
}
},
{
"id": "deploy-atomic-patch-to-s3-version",
"s3": {
"disabled": $[IS_NIGHTLY],
"bucket": "{terraform.infra.infra.bucket_binaries}",
"directory": "proda/StaticCDN/atomic/v$[ATOMIC_PATCH_VERSION]",
"source": "packages/atomic/dist/atomic",
Expand All @@ -95,6 +126,7 @@
{
"id": "deploy-atomic-minor-to-s3-version",
"s3": {
"disabled": $[IS_NIGHTLY],
"bucket": "{terraform.infra.infra.bucket_binaries}",
"directory": "proda/StaticCDN/atomic/v$[ATOMIC_MINOR_VERSION]",
"source": "packages/atomic/dist/atomic",
Expand All @@ -106,6 +138,7 @@
{
"id": "deploy-atomic-major-to-s3-version",
"s3": {
"disabled": $[IS_NIGHTLY],
"bucket": "{terraform.infra.infra.bucket_binaries}",
"directory": "proda/StaticCDN/atomic/v$[ATOMIC_MAJOR_VERSION]",
"source": "packages/atomic/dist/atomic",
Expand All @@ -117,6 +150,7 @@
{
"id": "deploy-atomic-minor-storybook-to-s3-version",
"s3": {
"disabled": $[IS_NIGHTLY],
"bucket": "{terraform.infra.infra.bucket_binaries}",
"directory": "proda/StaticCDN/atomic/v$[ATOMIC_MINOR_VERSION]/storybook",
"source": "packages/atomic/dist-storybook",
Expand All @@ -128,6 +162,7 @@
{
"id": "deploy-atomic-react-patch-to-s3-version",
"s3": {
"disabled": $[IS_NIGHTLY],
"bucket": "{terraform.infra.infra.bucket_binaries}",
"directory": "proda/StaticCDN/atomic-react/v$[ATOMIC_REACT_PATCH_VERSION]",
"source": "packages/atomic-react/dist",
Expand All @@ -139,6 +174,7 @@
{
"id": "deploy-atomic-react-minor-to-s3-version",
"s3": {
"disabled": $[IS_NIGHTLY],
"bucket": "{terraform.infra.infra.bucket_binaries}",
"directory": "proda/StaticCDN/atomic-react/v$[ATOMIC_REACT_MINOR_VERSION]",
"source": "packages/atomic-react/dist",
Expand All @@ -150,6 +186,7 @@
{
"id": "deploy-atomic-react-major-to-s3-version",
"s3": {
"disabled": $[IS_NIGHTLY],
"bucket": "{terraform.infra.infra.bucket_binaries}",
"directory": "proda/StaticCDN/atomic-react/v$[ATOMIC_REACT_MAJOR_VERSION]",
"source": "packages/atomic-react/dist",
Expand All @@ -161,6 +198,7 @@
{
"id": "deploy-atomic-hosted-page-patch-to-s3-version",
"s3": {
"disabled": $[IS_NIGHTLY],
"bucket": "{terraform.infra.infra.bucket_binaries}",
"directory": "proda/StaticCDN/atomic-hosted-page/v$[ATOMIC_HOSTED_PAGE_PATCH_VERSION]",
"source": "packages/atomic-hosted-page/dist",
Expand All @@ -172,6 +210,7 @@
{
"id": "deploy-atomic-hosted-page-minor-to-s3-version",
"s3": {
"disabled": $[IS_NIGHTLY],
"bucket": "{terraform.infra.infra.bucket_binaries}",
"directory": "proda/StaticCDN/atomic-hosted-page/v$[ATOMIC_HOSTED_PAGE_MINOR_VERSION]",
"source": "packages/atomic-hosted-page/dist",
Expand All @@ -183,6 +222,7 @@
{
"id": "deploy-atomic-hosted-page-major-to-s3-version",
"s3": {
"disabled": $[IS_NIGHTLY],
"bucket": "{terraform.infra.infra.bucket_binaries}",
"directory": "proda/StaticCDN/atomic-hosted-page/v$[ATOMIC_HOSTED_PAGE_MAJOR_VERSION]",
"source": "packages/atomic-hosted-page/dist",
Expand Down Expand Up @@ -210,7 +250,8 @@
"extra_parameters": {
"atomic-major": "$[ATOMIC_MAJOR_VERSION]",
"atomic-minor": "$[ATOMIC_MINOR_VERSION]",
"atomic-patch": "$[ATOMIC_PATCH_VERSION]"
"atomic-patch": "$[ATOMIC_PATCH_VERSION]",
"is-nightly": "$[IS_NIGHTLY]"
}
}
},
Expand All @@ -222,7 +263,7 @@
"workflow_reference": "main",
"workflow_repository": "coveo-platform/ui-kit-cd",
"prd": {
"disabled": false
"disabled": $[IS_NIGHTLY]
},
"extra_parameters": {
"run-id": "$[GITHUB_RUN_ID]"
Expand Down
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ module.exports = {
'!.storybook',
'scripts/deploy/execute-deployment-pipeline.mjs',
'build',
'.deployment.config.json',
],
env: {
jest: true,
Expand Down
22 changes: 0 additions & 22 deletions .github/actions/create-deployment-package/action.yml

This file was deleted.

13 changes: 13 additions & 0 deletions .github/actions/playwright-headless-ssr-commerce/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: 'Playwright Headless SSR Commerce'
description: 'Run Playwright tests for Headless SSR Commerce'
runs:
using: composite
steps:
- name: Install Playwright Browsers
run: npx playwright install --with-deps
working-directory: packages/samples/headless-ssr-commerce
shell: bash
- name: Run Playwright tests
run: npx playwright test
working-directory: packages/samples/headless-ssr-commerce
shell: bash
21 changes: 20 additions & 1 deletion .github/workflows/prbot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,10 @@ jobs:
- run: npm run build
- name: Identify E2E Test Files to run
id: determine-tests
run: node ./scripts/ci/determine-tests.mjs testsToRun shardIndex shardTotal
run: |
runAllTests=$([ "${{ github.event_name }}" == "merge_group" ] && echo true || echo false)
node ./scripts/ci/determine-tests.mjs testsToRun shardIndex shardTotal $runAllTests
env:
projectRoot: ${{ github.workspace }}
maximumShards: ${{ env.maximumShards }}
Expand Down Expand Up @@ -403,6 +406,20 @@ jobs:
- uses: ./.github/actions/setup
- run: npm run build
- uses: ./.github/actions/playwright-atomic-hosted-pages
playwright-headless-ssr-commerce:
name: 'Run e2e tests for Headless Commerce SSR'
needs: build
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit

- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: ./.github/actions/setup
- run: npm run build
- uses: ./.github/actions/playwright-headless-ssr-commerce
e2e-atomic-insight-panel-test:
name: 'Run e2e tests on Atomic insight panel'
needs: build
Expand Down Expand Up @@ -503,6 +520,7 @@ jobs:
- 'unit-test'
- 'playwright-atomic'
- 'playwright-atomic-hosted-page-test'
- 'playwright-headless-ssr-commerce'
- 'e2e-atomic-test'
- 'e2e-atomic-csp-test'
- 'e2e-quantic'
Expand Down Expand Up @@ -543,6 +561,7 @@ jobs:
- 'unit-test'
- 'playwright-atomic'
- 'playwright-atomic-hosted-page-test'
- 'playwright-headless-ssr-commerce'
- 'e2e-atomic-test'
- 'e2e-atomic-screenshots'
- 'e2e-atomic-react-test'
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ packages/quantic/docs/out/quantic-docs.json
packages/samples/headless-react/build/**/*
packages/samples/angular/src/lang/*.json
packages/samples/vuejs/public/lang/*.json
.deployment.config.json
Loading

0 comments on commit 93b3967

Please sign in to comment.