Merge branch 'develop-6.5.x' into epic/b2b-commerce-quotes

SAP · Sep 20, 2023 · 8c3278a · 8c3278a
2 parents 200f9f1 + c933a6c
commit 8c3278a
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/cache-node-modules.yml b/.github/workflows/cache-node-modules.yml
@@ -8,7 +8,7 @@ on:
 name: Cache node modules
 
 env:
-  NODE_VERSION: '16'
+  NODE_VERSION: '18'
 
 jobs:
   cacheNodeModules:   

diff --git a/.github/workflows/ci-continuous-integration.yml b/.github/workflows/ci-continuous-integration.yml
@@ -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 }}
 

diff --git a/.github/workflows/ci-merge-checks.yml b/.github/workflows/ci-merge-checks.yml
@@ -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 }}

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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 }}

diff --git a/.github/workflows/lighthouse.yml b/.github/workflows/lighthouse.yml
@@ -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 }}

diff --git a/ci-scripts/e2e-cypress.sh b/ci-scripts/e2e-cypress.sh
@@ -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)

diff --git a/ci-scripts/lhci.sh b/ci-scripts/lhci.sh
@@ -2,6 +2,7 @@
 set -e
 
 export SPA_ENV='lighthouse'
+export NODE_OPTIONS=--dns-result-order=ipv4first
 
 npm install -g @lhci/[email protected]
 

diff --git a/tools/config/const.ts b/tools/config/const.ts
@@ -10,4 +10,4 @@ export const SPARTACUS_SCOPE = '@spartacus';
 export const SAP_SCOPE = 'sap';
 export const SAPUI5_TYPES = '@sapui5/ts-types-esm';
 export const SPARTACUS_SCHEMATICS = `${SPARTACUS_SCOPE}/schematics`;
-export const PUBLISHING_VERSION = '6.3.0-1';
+export const PUBLISHING_VERSION = '';