ci: Use build environment with Arm GNU Toolchain 13.2.Rel1

Version 2 of the open-iot-sdk Docker image in the GitLab CI contains Arm GNU Toolchain 13.2.Rel1. Additionally, the GitHub CI now also installs this version in its build enviornment. Signed-off-by: Dávid Házi <[email protected]>
FreeRTOS · Dec 18, 2023 · 2d615de · 2d615de
1 parent ae21d80
commit 2d615de
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -41,7 +41,11 @@ jobs:
       - name: Install GNU Arm toolchain
         shell: bash
         run: |
-          sudo apt-get -y install gcc-arm-none-eabi
+          sudo apt-get -y install tar
+          pushd $HOME
+          wget https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz
+          tar -xf arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz
+          popd
       - name: Generate dummy device credentials
         shell: bash
         run: |
@@ -55,6 +59,7 @@ jobs:
       - name: Build the project
         shell: bash
         run: |
+          export PATH=$HOME/arm-gnu-toolchain-13.2.Rel1-x86_64-arm-none-eabi/bin:$PATH
           ./tools/scripts/build.sh aws-iot-example --toolchain GNU --certificate_path $PWD/certificate.pem  --private_key_path $PWD/private_key.pem
       - name: Copy artifacts
         shell: bash

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ include:
   local: '$PWD/tools/ci/pipeline-baseline-fri.yml'
 
 variables:
-  OPEN_IOT_SDK_DOCKER_VERSION: v1
+  OPEN_IOT_SDK_DOCKER_VERSION: v2
   KUBERNETES_CPU_REQUEST: 1
   KUBERNETES_MEMORY_REQUEST: 1Gi
   GIT_SUBMODULE_STRATEGY: recursive