Skip to content

Commit

Permalink
Merge branch 'master' into SFINT-5680
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonMilord authored Nov 6, 2024
2 parents 9fef47e + 2eefb48 commit 2f43038
Show file tree
Hide file tree
Showing 587 changed files with 10,651 additions and 2,175 deletions.
1 change: 1 addition & 0 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"coveo",
"coveobueno",
"coveointernaltesting",
"coveosearch",
"coveotaggedword",
"coversationid",
"CRGA",
Expand Down
2 changes: 2 additions & 0 deletions .github/actions/e2e-atomic-angular/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ inputs:
runs:
using: composite
steps:
- run: npx cypress install
shell: bash
- uses: cypress-io/github-action@v5
name: Run Cypress
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/actions/e2e-atomic-insight-panel/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ inputs:
runs:
using: composite
steps:
- run: npx cypress install
shell: bash
- uses: cypress-io/github-action@v5
name: Run Cypress
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/actions/e2e-atomic-next/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ inputs:
runs:
using: composite
steps:
- run: npx cypress install
shell: bash
- uses: cypress-io/github-action@v5
name: Run Cypress
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/actions/e2e-atomic-react/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ inputs:
runs:
using: composite
steps:
- run: npx cypress install
shell: bash
- uses: cypress-io/github-action@v5
name: Run Cypress
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/actions/e2e-headless-ssr-app-dev/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ inputs:
runs:
using: composite
steps:
- run: npx cypress install
shell: bash
- uses: cypress-io/github-action@v5
name: Run Cypress
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/actions/e2e-headless-ssr-app-prod/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ inputs:
runs:
using: composite
steps:
- run: npx cypress install
shell: bash
- uses: cypress-io/github-action@v5
name: Run Cypress
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/actions/e2e-headless-ssr-pages-dev/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ inputs:
runs:
using: composite
steps:
- run: npx cypress install
shell: bash
- uses: cypress-io/github-action@v5
name: Run Cypress
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/actions/e2e-headless-ssr-pages-prod/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ inputs:
runs:
using: composite
steps:
- run: npx cypress install
shell: bash
- uses: cypress-io/github-action@v5
name: Run Cypress
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/actions/e2e-iife/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ inputs:
runs:
using: composite
steps:
- run: npx cypress install
shell: bash
- uses: cypress-io/github-action@v5
name: Run Cypress
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/actions/e2e-stencil/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ inputs:
runs:
using: composite
steps:
- run: npx cypress install
shell: bash
- uses: cypress-io/github-action@v5
name: Run Cypress
with:
Expand Down
29 changes: 18 additions & 11 deletions .github/workflows/prbot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,14 @@ jobs:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: ./.github/actions/setup
- run: npm test
package-compatibility:
name: 'Verify compatibility of packages'
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: ./.github/actions/setup
- run: npm run package-compatibility
e2e-atomic-csp-test:
name: 'Run e2e tests on Atomic CSP'
needs: build
Expand All @@ -86,8 +94,8 @@ jobs:
maximumShards: 24
outputs:
testsToRun: ${{ steps.determine-tests.outputs.testsToRun }}
shardIndex: ${{ steps.set-matrix.outputs.shardIndex }}
shardTotal: ${{ steps.set-matrix.outputs.shardTotal }}
shardIndex: ${{ steps.determine-tests.outputs.shardIndex }}
shardTotal: ${{ steps.determine-tests.outputs.shardTotal }}
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
with:
Expand All @@ -96,17 +104,16 @@ jobs:
- run: npm run build
- name: Identify E2E Test Files to run
id: determine-tests
run: node ./scripts/ci/find-tests.mjs testsToRun
run: node ./scripts/ci/determine-tests.mjs testsToRun shardIndex shardTotal
env:
projectRoot: ${{ github.workspace }}
shell: bash
- name: Determine Shard Values
id: set-matrix
run: node ./scripts/ci/determine-shard.mjs shardIndex shardTotal
env:
testsToRun: ${{ steps.determine-tests.outputs.testsToRun }}
maximumShards: ${{ env.maximumShards }}
shell: bash
- name: Log Shard Values for Debugging
run: |
echo "Shard Index: ${{ steps.determine-tests.outputs.shardIndex }}"
echo "Shard Total: ${{ steps.determine-tests.outputs.shardTotal }}"
shell: bash
playwright-atomic:
name: 'Run Playwright tests for Atomic'
needs: prepare-playwright-atomic
Expand All @@ -115,8 +122,8 @@ jobs:
strategy:
fail-fast: false
matrix:
shardIndex: ${{fromJson(needs.prepare-playwright-atomic.outputs.shardIndex || '[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24]')}}
shardTotal: ${{fromJson(needs.prepare-playwright-atomic.outputs.shardTotal || '[24]')}}
shardIndex: ${{ fromJson(needs.prepare-playwright-atomic.outputs.shardIndex) }}
shardTotal: ${{ fromJson(needs.prepare-playwright-atomic.outputs.shardTotal) }}
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: ./.github/actions/setup
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ sarifs
**.cy.ts.mp4
.cspellcache
scripts/translation-gpt/temporary.json
packages/headless/docs

# CI Release
topology.json
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.16.0
22.11.0
1 change: 0 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ utils/**/.storybook/**
scripts/deploy/execute-deployment-pipeline.mjs
**/staticresources/**
packages/atomic-hosted-page/loader/**/*
packages/atomic/loader/**/*
packages/atomic/docs/**/*
packages/atomic/dist-storybook/**/*
packages/atomic/src/components/search/atomic-search-interface/lang/*.json
Expand Down
Loading

0 comments on commit 2f43038

Please sign in to comment.