Skip to content

Commit

Permalink
Merge branch 'develop-6.5.x' into epic/ssr-error-handling
Browse files Browse the repository at this point in the history
# Conflicts:
#	projects/core/src/product/store/actions/product-references.action.ts
#	projects/core/src/product/store/actions/product-reviews.action.ts
#	projects/core/src/product/store/effects/product-reviews.effect.ts
#	projects/core/src/state/utils/entity-loader/entity-loader.action.ts
  • Loading branch information
kpawelczak committed Sep 27, 2023
2 parents 8bba7a6 + ae83fd2 commit 61f9364
Show file tree
Hide file tree
Showing 470 changed files with 17,934 additions and 2,442 deletions.
19 changes: 16 additions & 3 deletions .env-cmdrc
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@
"CX_B2B": "true",
"CX_CPQ": "true"
},
"segment-refs": {
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-p7-public.model-t.myhybris.cloud",
"CX_SEGMENT_REFS": "true"
},
"b2c": {
"CX_B2B": "false",
"CX_CDS": "false"
Expand All @@ -42,9 +46,18 @@
"CX_B2B": "true"
},
"s4om": {
"CX_BASE_URL": "https://backoffice.c2twgq1sul-sapcxteam1-d11-public.model-t.myhybris.cloud",
"CX_CDC": "false",
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
"CX_B2B": "true",
"CX_S4OM": "true"
"CX_S4OM": "true",
"CX_REQUESTED_DELIVERY_DATE": "true",
"CX_PDF_INVOICES": "true"
},
"requested-delivery-date": {
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
"CX_REQUESTED_DELIVERY_DATE": "true"
},
"pdf-invoices": {
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s5-public.model-t.myhybris.cloud",
"CX_PDF_INVOICES": "true"
}
}
85 changes: 12 additions & 73 deletions .github/api-extractor-action/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 15 additions & 41 deletions .github/cache-builded-libs/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/cache-node-modules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
name: Cache node modules

env:
NODE_VERSION: '16'
NODE_VERSION: '18'

jobs:
cacheNodeModules:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
# empty as it is used only to manually trigger the workflow

env:
NODE_VERSION: '16'
NODE_VERSION: '18'
NX_BASE: origin/${{ github.event.pull_request.base.ref }}
NX_HEAD: origin/${{ github.event.pull_request.head.ref }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-merge-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
env:
CYPRESS_KEY: ${{ secrets.CYPRESS_KEY }}
GH_TOKEN: ${{ github.token }}
NODE_VERSION: '16'
NODE_VERSION: '18'

concurrency:
group: ci-merge-checks-${{ github.head_ref || github.run_id }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

env:
CYPRESS_KEY: ${{ secrets.CYPRESS_KEY }}
NODE_VERSION: '16'
NODE_VERSION: '18'

concurrency:
group: ci-${{ github.head_ref || github.run_id }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lighthouse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
# empty as it is used only to manually trigger the workflow
env:
CYPRESS_KEY: ${{ secrets.CYPRESS_KEY }}
NODE_VERSION: '16'
NODE_VERSION: '18'

concurrency:
group: lighthouse-${{ github.head_ref || github.run_id }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ scripts/install/config.sh
*.launch
.settings/
*.sublime-workspace
*.swp

# IDE - VSCode
.vscode/settings.json
Expand Down
2 changes: 2 additions & 0 deletions ci-scripts/e2e-cypress.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ fi
echo '-----'
echo "Building Spartacus libraries"

export NODE_OPTIONS=--dns-result-order=ipv4first

npm ci

(cd projects/storefrontapp-e2e-cypress && npm ci)
Expand Down
1 change: 1 addition & 0 deletions ci-scripts/lhci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
set -e

export SPA_ENV='lighthouse'
export NODE_OPTIONS=--dns-result-order=ipv4first

npm install -g @lhci/[email protected]

Expand Down
5 changes: 2 additions & 3 deletions ci-scripts/unit-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@ set -o pipefail

EXCLUDE_APPLICATIONS=storefrontapp
EXCLUDE_JEST=storefrontstyles,schematics,setup
EXCLUDE_INTEGRATION_LIBS=cdc,cds,digital-payments,epd-visualization,s4om

echo "-----"

function run_affected_unit_tests {
echo "Running JASMINE unit tests and code coverage for AFFECTED libraries"
npx nx affected --target=test --exclude="$EXCLUDE_APPLICATIONS,$EXCLUDE_JEST,$EXCLUDE_INTEGRATION_LIBS" -- --no-watch --source-map --code-coverage --browsers ChromeHeadless
npx nx affected --target=test --exclude="$EXCLUDE_APPLICATIONS,$EXCLUDE_JEST" -- --no-watch --source-map --code-coverage --browsers ChromeHeadless

echo "Running JEST (mostly schematics) unit tests and code coverage for AFFECTED libraries"
npx nx affected --target=test-jest --exclude="$EXCLUDE_APPLICATIONS,$EXCLUDE_INTEGRATION_LIBS" -- --coverage --runInBand
npx nx affected --target=test-jest --exclude="$EXCLUDE_APPLICATIONS" -- --coverage --runInBand
}

function run_all_unit_tests {
Expand Down
Loading

0 comments on commit 61f9364

Please sign in to comment.