Merge pull request #2 from Arm-Examples/update_toolbox

Update CI to use latest CMSIS-Toolbox 2.1.0
Arm-Examples · Oct 4, 2023 · caaedcd · caaedcd
2 parents 9103a4c + 310d21d
commit caaedcd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 20 deletions.
diff --git a/.github/workflows/virtual_hardware.yml b/.github/workflows/virtual_hardware.yml
@@ -53,8 +53,8 @@ jobs:
 
     - name: Install AVH Client for Python
       run: |
-        pip install git+https://github.com/ARM-software/avhclient.git@v0.1
-
+        pip install arm-avhclient
+        
     - name: Configure AWS IoT Thing Credentials
       env:
         MQTT_BROKER_ENDPOINT: ${{ secrets.MQTT_BROKER_ENDPOINT }}

diff --git a/Demo.cproject.yml b/Demo.cproject.yml
@@ -74,7 +74,7 @@ project:
     - group: config_files
       files:
         - file: ./config_files/aws_demo_config.h
-        - file: ./config_files/aws_iot_network_Config.h
+        - file: ./config_files/aws_iot_network_config.h
         - file: ./config_files/aws_mbedtls_config.h
         - file: ./config_files/core_mqtt_config.h
         - file: ./config_files/core_pkcs11_config.h

diff --git a/avh.yml b/avh.yml
@@ -15,24 +15,16 @@ upload:
   - README.md
 steps:
   - run: |
-      echo "Upgrade to CMSIS-Toolbox 1.2.0"
-      wget https://github.com/Open-CMSIS-Pack/cmsis-toolbox/releases/download/1.2.0/cmsis-toolbox-linux64.tar.gz
+      echo "Upgrade to CMSIS-Toolbox 2.1.0"
+      wget https://github.com/Open-CMSIS-Pack/cmsis-toolbox/releases/download/2.1.0/cmsis-toolbox-linux-amd64.tar.gz
       sudo mv /opt/ctools/ /opt/ctools-1.0.0
-      sudo tar -xf cmsis-toolbox-linux64.tar.gz --directory /opt/
-      sudo mv /opt/cmsis-toolbox-linux64/ /opt/ctools/
-      sudo sed -i 's|set(TOOLCHAIN_ROOT ".*")|set(TOOLCHAIN_ROOT "'$(dirname $(which armclang 2>/dev/null))'")|' $(find /opt/ctools/etc/ -type f -name "AC6*.cmake")
-      sudo sed -i 's|set(TOOLCHAIN_ROOT ".*")|set(TOOLCHAIN_ROOT "'$(dirname $(which arm-none-eabi-gcc 2>/dev/null))'")|' $(find /opt/ctools/etc/ -type f -name "GCC*.cmake")
+      sudo tar -xf cmsis-toolbox-linux-amd64.tar.gz --directory /opt/
+      sudo mv /opt/cmsis-toolbox-linux-amd64/ /opt/ctools/
   - run: |
-      echo ">csolution -s Demo.csolution.yml list packs -m >packlist"
-      csolution -s Demo.csolution.yml list packs -m >packlist
-      echo ">cpackget add -f packlist -a"
-      cpackget add -f packlist -a
-      echo ">csolution convert -s Demo.csolution.yml -c Demo.Debug+AVH"
-      csolution convert -s Demo.csolution.yml -c Demo.Debug+AVH
-      echo ">cbuild Demo.Debug+AVH.cprj"
-      cbuild Demo.Debug+AVH.cprj
-      echo ">VHT_MPS3_Corstone_SSE-300 -f Board/AVH_MPS3_Corstone-300/fvp_config.txt --stat --simlimit 600 out/Demo/AVH/Debug/Demo.Debug+AVH.axf"
-      VHT_MPS3_Corstone_SSE-300 -f Board/AVH_MPS3_Corstone-300/fvp_config.txt --stat --simlimit 600 out/Demo/AVH/Debug/Demo.Debug+AVH.axf >Demo.log
-      cat Demo.log
+      export AC6_TOOLCHAIN_6_18=$(dirname $(which armclang 2>/dev/null))
+      echo ">cbuild -p Demo.csolution.yml"
+      cbuild -p -c Demo.Debug+AVH Demo.csolution.yml
+      echo ">VHT_MPS3_Corstone_SSE-300 -f Board/AVH_MPS3_Corstone-300/fvp_config.txt --stat --simlimit 600 out/Demo/AVH/Debug/Demo.axf"
+      VHT_MPS3_Corstone_SSE-300 -f Board/AVH_MPS3_Corstone-300/fvp_config.txt --stat --simlimit 600 out/Demo/AVH/Debug/Demo.axf | tee Demo.log
 download:
   - Demo.log