Refactor CI job to decompose test steps into reusable script functions

Author: BujSet

.ci/scripts/zephyr-utils.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
+download_arm_zephyr_sdk () {
+    wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.0/zephyr-sdk-0.16.0_linux-x86_64.tar.xz
+    tar -xf zephyr-sdk-0.16.0_linux-x86_64.tar.xz
+    rm -f zephyr-sdk-0.16.0_linux-x86_64.tar.xz
+}
+
+setup_zephyr_et_module () {
+    git clone --branch executorch-module-integration https://github.com/BujSet/zephyr.git
+    west init -l zephyr
+    west config manifest.project-filter -- +executorch
+    west -v update
+}

.github/workflows/trunk.yml

@@ -74,31 +74,36 @@ jobs:
         conda activate "${CONDA_ENV}"
 
         source .ci/scripts/utils.sh
+        source .ci/scripts/zephyr-utils.sh
         mkdir -p zephyr_scratch/
         cd zephyr_scratch
         export ZEPHYR_PROJ_ROOT=$(realpath $(pwd))
 
-        wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.0/zephyr-sdk-0.16.0_linux-x86_64.tar.xz
-        tar -xf zephyr-sdk-0.16.0_linux-x86_64.tar.xz
-        rm -f zephyr-sdk-0.16.0_linux-x86_64.tar.xz
-        cd zephyr-sdk-0.16.0/
-        ./setup.sh -c -t arm-zephyr-eabi
+        download_arm_zephyr_sdk
+        ./zephyr-sdk-0.16.0/setup.sh -c -t arm-zephyr-eabi
+
+        #wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.0/zephyr-sdk-0.16.0_linux-x86_64.tar.xz
+        #tar -xf zephyr-sdk-0.16.0_linux-x86_64.tar.xz
+        #rm -f zephyr-sdk-0.16.0_linux-x86_64.tar.xz
+        #cd zephyr-sdk-0.16.0/
+        #./setup.sh -c -t arm-zephyr-eabi
 
         cd $ZEPHYR_PROJ_ROOT
-        git clone https://github.com/BujSet/zephyr.git
-        cd zephyr/
-        git switch -c executorch-module-integration origin/executorch-module-integration
-        cd $ZEPHYR_PROJ_ROOT
-        west init -l zephyr
-        west config manifest.project-filter -- +executorch
-        west -v update
+        setup_zephyr_et_module
+        #git clone https://github.com/BujSet/zephyr.git
+        #cd zephyr/
+        #git switch -c executorch-module-integration origin/executorch-module-integration
+        #cd $ZEPHYR_PROJ_ROOT
+        #west init -l zephyr
+        #west config manifest.project-filter -- +executorch
+        #west -v update
 
         cd $ZEPHYR_PROJ_ROOT/modules/lib/executorch
         install_executorch "--use-pt-pinned-commit"
         .ci/scripts/setup-arm-baremetal-tools.sh --target-toolchain zephyr
         source examples/arm/ethos-u-scratch/setup_path.sh
-        cd $ZEPHYR_PROJ_ROOT
-        source zephyr/zephyr-env.sh
+        #cd $ZEPHYR_PROJ_ROOT
+        source $ZEPHYR_PROJ_ROOT/zephyr/zephyr-env.sh
         cd $ZEPHYR_PROJ_ROOT/zephyr/samples/modules/executorch/arm/hello_world
         west build -p always -b mps3/corstone300/fvp
         FVP_Corstone_SSE-300_Ethos-U55 -a build/zephyr/zephyr.elf -C mps3_board.visualisation.disable-visualisation=1 -C mps3_board.telnetterminal0.start_telnet=0 -C mps3_board.uart0.out_file='sim.out'  -C cpu0.CFGITCMSZ=15 -C cpu0.CFGDTCMSZ=15 --simlimit 60