Run E2E with CMake 4.2.1

Author: soumeh01

.github/workflows/e2e_test.yaml

@@ -21,35 +21,49 @@ jobs:
       test: ${{ steps.test-matrix.outputs.matrix }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
       - uses: JoshuaTheMiller/conditional-build-matrix@81b51eb8d89e07b86404934b5fecde1cea1163a5 # v2.0.1
-        id: test-matrix
+        id: test-matrix-base
         with:
           inputFile: '.github/matrix_includes.json'
           filter: '[?runTests==`true`]'
 
+      - name: Generate matrix with cmake versions
+        id: test-matrix
+        run: |
+          base_matrix='${{ steps.test-matrix-base.outputs.matrix }}'
+          cmake_versions='["vcpkg", "4.2.1"]'
+          
+          # Create cross-product of base matrix and cmake versions
+          result=$(jq -nc --argjson base "$base_matrix" --argjson cmake "$cmake_versions" '
+            {include: [$base.include[] as $config | $cmake[] as $version | $config + {cmake_version: $version}]}
+          ')
+          
+          echo "matrix=$result" >> $GITHUB_OUTPUT
+
   test:
     needs: [ matrix_prep ]
     runs-on: ${{ matrix.runs_on }}
     continue-on-error: true
     strategy:
-      matrix: ${{ fromJson(needs.matrix_prep.outputs.test) }}
+      matrix:
+        include: ${{ fromJson(needs.matrix_prep.outputs.test) }}
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
       - name: Set up Python
-        uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
+        uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
         with:
           python-version: '3.11'
           cache: 'pip'
@@ -59,13 +73,34 @@ jobs:
             pip install --upgrade pip
             pip install -r test/e2e/requirements.txt
 
-      - name: Setup vcpkg environment
+      - name: Create vcpkg config without CMake
+        if: matrix.cmake_version != 'vcpkg'
+        shell: bash
+        run: |
+          jq 'del(.requires."arm:tools/kitware/cmake")' ./test/vcpkg-configuration.json > ./test/vcpkg-configuration-temp.json
+
+      - name: Setup vcpkg environment (with CMake from vcpkg)
+        if: matrix.cmake_version == 'vcpkg'
         uses: ARM-software/cmsis-actions/vcpkg@afc8e1a46fad8a5e1a08f8477b71050d442f60a7 # v1
         with:
           config: "./test/vcpkg-configuration.json"
           vcpkg-downloads: "${{ github.workspace }}/.vcpkg/downloads"
           cache: "-"
 
+      - name: Setup vcpkg environment (without CMake)
+        if: matrix.cmake_version != 'vcpkg'
+        uses: ARM-software/cmsis-actions/vcpkg@afc8e1a46fad8a5e1a08f8477b71050d442f60a7 # v1
+        with:
+          config: "./test/vcpkg-configuration-temp.json"
+          vcpkg-downloads: "${{ github.workspace }}/.vcpkg/downloads"
+          cache: "-"
+
+      - name: Install CMake ${{ matrix.cmake_version }}
+        if: matrix.cmake_version != 'vcpkg'
+        uses: jwlawson/actions-setup-cmake@802fa1a2c4e212495c05bf94dba2704a92a472be # v2.0.2
+        with:
+          cmake-version: '${{ matrix.cmake_version }}'
+
       - name: Activate Arm tool license
         run: |
           armlm activate --server https://mdk-preview.keil.arm.com --product KEMDK-COM0
@@ -87,34 +122,34 @@ jobs:
         env:
           IAR_LMS_BEARER_TOKEN: ${{ secrets.IAR_TOKEN }}
         run: |
-          robot --outputdir reports-${{ matrix.target }}-${{ matrix.arch }} \
-            --variable TEST_ENV_FILE:test-env-${{ matrix.target }}-${{ matrix.arch }}.md \
-            --consolewidth=150 --settag ${{ matrix.target }}-${{ matrix.arch }} \
-            --name ${{ matrix.target }}-${{ matrix.arch }} \
+          robot --outputdir reports-${{ matrix.target }}-${{ matrix.arch }}-cmake${{ matrix.cmake_version }} \
+            --variable TEST_ENV_FILE:test-env-${{ matrix.target }}-${{ matrix.arch }}-cmake${{ matrix.cmake_version }}.md \
+            --consolewidth=150 --settag ${{ matrix.target }}-${{ matrix.arch }}-cmake${{ matrix.cmake_version }} \
+            --name ${{ matrix.target }}-${{ matrix.arch }}-cmake${{ matrix.cmake_version }} \
             ./e2e
 
       - name: Archieve test results
         if: always()
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
-          name: reports-${{ matrix.target }}-${{ matrix.arch }}
-          path: ./test/reports-${{ matrix.target }}-${{ matrix.arch }}
+          name: reports-${{ matrix.target }}-${{ matrix.arch }}-cmake${{ matrix.cmake_version }}
+          path: ./test/reports-${{ matrix.target }}-${{ matrix.arch }}-cmake${{ matrix.cmake_version }}
 
   report:
     runs-on: ubuntu-latest
-    if: always()
-    needs: test
+    if: always() && needs.test.result != 'skipped'
+    needs: [ test ]
     permissions: write-all
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+      uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
       with:
         egress-policy: audit
 
-    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
     - name: Set up Python
-      uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
+      uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
       with:
         python-version: '3.11'
         cache: 'pip'
@@ -125,7 +160,7 @@ jobs:
           pip install -r test/e2e/requirements.txt
 
     - name: Download reports
-      uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+      uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
       with:
         path: artifacts
         pattern: reports-*
@@ -135,8 +170,10 @@ jobs:
       continue-on-error: true
       run: |
         python -m robot.rebot --name Collective_Robot_Results --outputdir collective_robot_results --output output.xml \
-          ./reports-windows-amd64/output.xml \
-          ./reports-linux-amd64/output.xml
+          ./reports-windows-amd64-cmakevcpkg/output.xml \
+          ./reports-windows-amd64-cmake4.2.1/output.xml \
+          ./reports-linux-amd64-cmakevcpkg/output.xml \
+          ./reports-linux-amd64-cmake4.2.1/output.xml
 
     - name: Generate Summary report
       if: always()
@@ -152,7 +189,7 @@ jobs:
 
     - name: Archieve consolidated test results
       if: always()
-      uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+      uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
       with:
         name: consolidated-reports
         path: artifacts/collective_robot_results