Update build environment to CMSIS-Toolbox 2.2.0

ARM-software · Nov 30, 2023 · e507095 · e507095
1 parent 9ec8db9
commit e507095
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 21 deletions.
diff --git a/.github/workflows/cmsis_rv2.yml b/.github/workflows/cmsis_rv2.yml
@@ -84,17 +84,11 @@ jobs:
           . <(curl https://aka.ms/vcpkg-init.sh -L)
           vcpkg x-update-registry --all
           vcpkg activate
-          
-          echo "Patch CMSIS-Toolbox"
-          pushd $(dirname $(which cbuild))/../etc
-          curl -O https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/main/tools/buildmgr/cbuildgen/config/CLANG.17.0.1.cmake
-          popd
+          export > "$GITHUB_ENV"
 
       - name: Activate Arm tool license
         working-directory: ./CMSIS-RTOS2_Validation/Project
         run: |
-          . /home/runner/.vcpkg/vcpkg-init
-          vcpkg activate
           if [[ -n "${{ env.ARM_UBL_ACTIVATION_CODE }}" ]]; then
               armlm activate --code ${{ env.ARM_UBL_ACTIVATION_CODE }}
           else
@@ -114,9 +108,6 @@ jobs:
       - name: Build
         working-directory: ./CMSIS-RTOS2_Validation/Project
         run: |
-          . /home/runner/.vcpkg/vcpkg-init
-          vcpkg activate
-
           echo "Register local packs"
           cpackget rm ARM::CMSIS ARM::Cortex_DFP ARM::CMSIS-RTX ARM::CMSIS-FreeRTOS || echo "Ok"
           cpackget add ${{ github.workspace }}/CMSIS_6/ARM.CMSIS.pdsc
@@ -131,24 +122,19 @@ jobs:
         if: ${{ env.ARM_UBL_ACTIVATION_CODE }}
         working-directory: ./CMSIS-RTOS2_Validation/Project
         run: |
-          . /home/runner/.vcpkg/vcpkg-init
-          vcpkg activate
-      
           echo "Run test projects ..."
           ./build.py --verbose -r ${{ matrix.rtos }} -c ${{ matrix.compiler }} run || echo "::warning::==== Some configurations failed to run! ==="
 
       - name: Deactivate Arm tool license
         if: always()
         working-directory: ./CMSIS-RTOS2_Validation/Project
         run: |
-          . /home/runner/.vcpkg/vcpkg-init
-          vcpkg activate
           if [[ -n "${{ env.ARM_UBL_ACTIVATION_CODE }}" ]]; then
-                  armlm deactivate --code ${{ env.ARM_UBL_ACTIVATION_CODE }}
-              else
-                  armlm deactivate --product KEMDK-COM0
-              fi
-    
+            armlm deactivate --code ${{ env.ARM_UBL_ACTIVATION_CODE }}
+          else
+            armlm deactivate --product KEMDK-COM0
+          fi
+
       - name: Perform CodeQL Analysis
         if: matrix.compiler == 'GCC'
         uses: github/codeql-action/analyze@v2

diff --git a/Project/vcpkg-configuration.json b/Project/vcpkg-configuration.json
@@ -17,7 +17,7 @@
     "arm:compilers/arm/armclang":"^6.20.0",
     "arm:compilers/arm/arm-none-eabi-gcc": "^13.2.1",
     "arm:compilers/arm/llvm-embedded": "^17.0.1-0",
-    "arm:tools/open-cmsis-pack/cmsis-toolbox": "^2.1.0-0",
+    "arm:tools/open-cmsis-pack/cmsis-toolbox": "^2.2.0-0",
     "arm:models/arm/avh-fvp": "^11.22.39"
   }
 }