Merge branch 'epic/punchout' into feature/CXSPA-10011

Author: FollowTheFlo

.eslintignore

@@ -4,7 +4,7 @@ on:
       - develop
       - develop-*
       - 'epic/**'
-      - release-*
+      - release/*
 name: Cache libs (dist)
 jobs:
   cacheBuildedLibs:

.github/workflows/cache-builded-libs.yml

@@ -4,7 +4,7 @@ on:
       - develop
       - develop-*
       - 'epic/**'
-      - release-*
+      - release/*
 name: Cache node modules
 
 env:

.github/workflows/cache-node-modules.yml

@@ -4,7 +4,7 @@ on:
     branches:
       - develop
       - develop-*
-      - release-*
+      - release/*
       - epic/**
   workflow_dispatch:
     # empty as it is used only to manually trigger the workflow
@@ -87,8 +87,80 @@ jobs:
       - name: Run linting validation
         run: |
           ci-scripts/validate-lint.sh
+  check_peer_dependencies:
+    name: CI - Check peerDependencies
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+      - name: Run peerDependencies check
+        run: |
+          bash ci-scripts/check-peer-deps.sh ${{ github.event.pull_request.base.ref }}
+      - name: Collect peer dependency changes
+        id: collect-peer-deps
+        run: |
+          if [ -s peer-deps-result.txt ]; then
+            echo "output<<EOF" >> $GITHUB_OUTPUT
+            echo "### ❗ peerDependencies changes detected:" >> $GITHUB_OUTPUT
+            cat peer-deps-result.txt >> $GITHUB_OUTPUT
+            echo "EOF" >> $GITHUB_OUTPUT
+          else
+            echo "output=No peerDependencies changes detected" >> $GITHUB_OUTPUT
+          fi
+      - name: Post PR comment if peerDependencies changed
+        if: failure() && github.event.pull_request
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const fs = require('fs');
+                const path = 'peer-deps-result.txt';
+
+            if (!fs.existsSync(path)) {
+              console.log("No peer-deps result file found. Skipping comment.");
+              return;
+            }
+
+            const diff = fs.readFileSync(path, 'utf8').trim();
+            if (!diff) {
+              console.log("peer-deps result file is empty. Skipping comment.");
+              return;
+            }
+
+            const issue_number = context.payload.pull_request.number;
+            const owner = context.repo.owner;
+            const repo = context.repo.repo;
+            const botUser = context.actor;
+
+            const commentHeader = "🚨 **PeerDependencies Change Detected** 🚨";
+
+            const body = `
+              ${commentHeader}
+
+              Your pull request includes modifications to \`peerDependencies\` in the following file(s):
+
+              \`\`\`diff
+              ${diff}
+              \`\`\`
+
+              Please note: Changes to peerDependencies are **restricted** and only permitted during **framework update releases**, as they may introduce breaking changes for customer's applications.
+              If you believe this change is necessary, please reach out to the Asterix team for further assistance.
+              `;
+
+            await github.rest.issues.createComment({
+              issue_number,
+              owner,
+              repo,
+              body
+            });
+
   ci_result:
-    needs: [unit_tests, sonarqube_scan, linting]
+    needs: [unit_tests, sonarqube_scan, linting, check_peer_dependencies]
     name: CI - Result
     runs-on: ubuntu-latest
     if: ${{ always() }}

.github/workflows/ci-continuous-integration.yml

@@ -4,7 +4,7 @@ on:
     branches:
       - develop
       - develop-*
-      - release-*
+      - release/*
   workflow_dispatch:
     # empty as it is used only to manually trigger the workflow
 
@@ -13,6 +13,7 @@ env:
   GH_TOKEN: ${{ github.token }}
   NODE_VERSION: '20'
   CONTINUUM_REGISTRY_TOKEN: ${{ secrets.CONTINUUM_REGISTRY_TOKEN }}
+  COMMON_SAP_ARTIFACTORY_TOKEN: ${{ secrets.COMMON_SAP_ARTIFACTORY_TOKEN }}
 
 concurrency:
   group: ci-merge-checks-${{ github.head_ref || github.run_id }}
@@ -151,8 +152,44 @@ jobs:
           BUILD_NUMBER: ci-build-number-${{ github.event.pull_request.head.sha || github.run_id }}
         run: |
           ci-scripts/e2e-cypress.sh -s b2b
+  a11y_e2e_tests:
+    needs: [no_retries, validate_e2e_execution]
+    name: MC - E2E A11Y
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        containers: [1, 2]
+    if: ${{ needs.validate_e2e_execution.outputs.SHOULD_RUN_E2E == 'true' }}
+    steps:
+      - name: Forcefully fail build if e2e job is retried
+        uses: actions/github-script@v7
+        with:
+          script: |
+            core.setFailed('Please push a commit to trigger the build. To push an empty commit you can use `git commit --allow-empty -m "Trigger Build"`')
+        if: ${{ github.run_attempt > 1 }}
+      - uses: actions/checkout@v4
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+      - name: Cache node_modules
+        id: cache-node-modules
+        uses: actions/cache@v4
+        with:
+          path: |
+            node_modules
+            projects/storefrontapp-e2e-cypress/node_modules
+            ~/.cache/Cypress
+          key: nodemodules-${{ github.event.pull_request.base.sha }}
+          restore-keys: nodemodules-${{ github.event.pull_request.base.sha }}
+      - name: Run e2es
+        env:
+          SPA_ENV: ci
+          BUILD_NUMBER: ci-build-number-${{ github.event.pull_request.head.sha || github.run_id }}
+        run: |
+          ci-scripts/e2e-cypress.sh -s a11y
   merge_checks_result:
-    needs: [b2c_e2e_tests, b2c_ssr_e2e_tests, b2b_e2e_tests]
+    needs: [b2c_e2e_tests, b2c_ssr_e2e_tests, b2b_e2e_tests, a11y_e2e_tests]
     name: MC - Result
     runs-on: ubuntu-latest
     if: ${{ always() }}
@@ -173,4 +210,5 @@ jobs:
         if: |
           needs.b2c_e2e_tests.result == 'failure' || needs.b2c_e2e_tests.result == 'cancelled' ||
           needs.b2c_ssr_e2e_tests.result == 'failure' || needs.b2c_ssr_e2e_tests.result == 'cancelled' ||
-          needs.b2b_e2e_tests.result == 'failure' || needs.b2b_e2e_tests.result == 'cancelled'
+          needs.b2b_e2e_tests.result == 'failure' || needs.b2b_e2e_tests.result == 'cancelled' ||
+          needs.a11y_e2e_tests.result == 'failure' || needs.a11y_e2e_tests.result == 'cancelled'

.github/workflows/ci-merge-checks.yml

@@ -4,7 +4,7 @@ on:
     branches:
       - develop
       - develop-*
-      - release-*
+      - release/*
   workflow_dispatch:
     # empty as it is used only to manually trigger the workflow
 

.github/workflows/ci-pull-request-status.yml

@@ -3,14 +3,15 @@ on:
     branches:
       - develop
       - develop-*
-      - release-*
+      - release/*
   workflow_dispatch:
     # empty as it is used only to manually trigger the workflow
 
 env:
   CYPRESS_KEY: ${{ secrets.CYPRESS_KEY }}
   NODE_VERSION: '20'
   CONTINUUM_REGISTRY_TOKEN: ${{ secrets.CONTINUUM_REGISTRY_TOKEN }}
+  COMMON_SAP_ARTIFACTORY_TOKEN: ${{ secrets.COMMON_SAP_ARTIFACTORY_TOKEN }}
 
 concurrency:
   group: ci-${{ github.head_ref || github.run_id }}
@@ -217,6 +218,42 @@ jobs:
           BUILD_NUMBER: ci-build-number-${{ github.event.pull_request.head.sha || github.run_id }}
         run: |
           ci-scripts/e2e-cypress.sh -s b2b
+  a11y_e2e_tests:
+    needs: [no_retries, validate_e2e_execution]
+    name: E2E tests for A11Y
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        containers: [1, 2]
+    if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' || needs.validate_e2e_execution.outputs.SHOULD_RUN_E2E == 'true' }}
+    steps:
+      - name: Forcefully fail build if e2e job is retried
+        uses: actions/github-script@v7
+        with:
+          script: |
+            core.setFailed('Please push a commit to trigger the build. To push an empty commit you can use `git commit --allow-empty -m "Trigger Build"`')
+        if: ${{ github.run_attempt > 1 }}
+      - uses: actions/checkout@v4
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+      - name: Cache node_modules
+        id: cache-node-modules
+        uses: actions/cache@v4
+        with:
+          path: |
+            node_modules
+            projects/storefrontapp-e2e-cypress/node_modules
+            ~/.cache/Cypress
+          key: nodemodules-${{ github.event.pull_request.base.sha }}
+          restore-keys: nodemodules-${{ github.event.pull_request.base.sha }}
+      - name: Run e2es
+        env:
+          SPA_ENV: ci
+          BUILD_NUMBER: ci-build-number-${{ github.event.pull_request.head.sha || github.run_id }}
+        run: |
+          ci-scripts/e2e-cypress.sh -s a11y
   ssr_tests:
     needs: [no_retries, validate_e2e_execution]
     name: SSR Tests

.github/workflows/ci.yml

@@ -13,9 +13,9 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "develop", "develop*", "release-*", "epic/*"]
+    branches: [ "develop", "develop*", "release/*", "epic/*"]
   pull_request:
-    branches: [ "develop", "develop*", "release-*", "epic/*" ]
+    branches: [ "develop", "develop*", "release/*", "epic/*" ]
   schedule:
     - cron: '45 2 * * *'
 

.github/workflows/codeql.yml

@@ -4,7 +4,7 @@ on:
     branches:
       - develop
       - develop-*
-      - release-*
+      - release/*
   workflow_dispatch:
     # empty as it is used only to manually trigger the workflow
 env:

.github/workflows/lighthouse.yml

@@ -1,20 +1,27 @@
-name: Minor Release
+name: Release snapshot (creates a snapshot from the develop branch or from the input-provided source)
 
 on:
   workflow_dispatch:
     inputs:
+      source:
+        description: 'Source to release from. Could be any branch or tag (e.g., release/2211.20.x, 2211.20.0). By default, the develop branch is used.'
+        required: false
       version:
         description: 'Release version (e.g., 2211.20.0 or 2211.20.0-1)'
+        required: true
+      create_pr:
+        description: 'Create a PR from the release branch to the source branch?'
         required: false
-  
+        type: 'boolean'
+        default: false
 jobs:
   release:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          ref: develop 
+          ref: ${{ github.event.inputs.source || 'develop' }}
 
       - name: Configure Git
         run: |
@@ -96,4 +103,50 @@ jobs:
           git add .
           git commit -m "Release ${{ env.version }}"
           git push origin "${{ env.RELEASE_BRANCH }}"
-  
+        
+      - name: Tag the release
+        run: |
+          git fetch origin "${{ env.RELEASE_BRANCH }}"
+          git checkout "${{ env.RELEASE_BRANCH }}"
+
+          TAG="${{ env.version }}"
+
+          # Check if tag already exists
+          if git rev-parse "refs/tags/$TAG" >/dev/null 2>&1; then
+            echo "Tag $TAG already exists. Skipping creation."
+          else
+            git tag -a "$TAG" -m "$TAG"
+            git push origin "$TAG"
+            echo "Created and pushed tag: $TAG"
+          fi
+
+      - name: Sync branch to a private repo
+        env:
+          GH_TOKEN: ${{ secrets.GH_PR_TOKEN }}
+        run: |
+          echo "Triggering repo-sync.yml with branch: ${{ env.RELEASE_BRANCH }}"
+          
+          curl -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer $GH_TOKEN" \
+            https://api.github.com/repos/${{ github.repository }}/actions/workflows/repo-sync.yml/dispatches \
+            -d "{\"ref\":\"${{ env.RELEASE_BRANCH }}\",\"inputs\":{\"branch_to_sync\":\"${{ env.RELEASE_BRANCH }}\"}}"
+
+      - name: Create Pull Request to develop
+        if: ${{ github.event.inputs.create_pr == 'true' }}
+        env:
+          GH_TOKEN: ${{ secrets.GH_PR_TOKEN }}
+        run: |
+          echo "Creating pull request from ${{ env.RELEASE_BRANCH }} to ${{ github.event.inputs.source }}..."
+
+          # Check if a PR already exists
+          existing_pr=$(gh pr list --head "${{ env.RELEASE_BRANCH }}" --base "${{ github.event.inputs.source }}" --json number --jq '.[].number')
+          if [[ -n "$existing_pr" ]]; then
+            echo "PR already exists: #$existing_pr"
+          else
+            gh pr create \
+              --head "${{ env.RELEASE_BRANCH }}" \
+              --base "${{ github.event.inputs.source }}" \
+              --title "chore(release): ${{ env.version }}" \
+              --body "Automated PR to merge release changes back into the source branch."
+          fi