CI: Updates to build rust examples for mixed environments

Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
apache · Jan 10, 2024 · 3e58869 · 3e58869
1 parent 0d5e285
commit 3e58869
Showing 1 changed file with 25 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -73,6 +73,7 @@ jobs:
           export CROSS_COMPILE="aarch64-linux-gnu-"
           export CROSS_COMPILE32="arm-linux-gnueabihf-"
           export CROSS_COMPILE64="aarch64-linux-gnu-"
+          export OPTEE_CLIENT_EXPORT=~/optee_client/out/export/
           ./setup.sh
           . ~/.cargo/env
 
@@ -82,16 +83,34 @@ jobs:
           (cd ~/optee_os && make PLATFORM=vexpress-qemu_armv8a)
           (cd ~/optee_client && make WITH_TEEACL=0)
 
-          # Build Arm 64-bit OP-TEE rust examples
+          # Build OP-TEE rust examples for Arm 64-bit both host and TA
           export TA_DEV_KIT_DIR=~/optee_os/out/arm-plat-vexpress/export-ta_arm64/
-          export OPTEE_CLIENT_EXPORT=~/optee_client/out/export/
           make
 
-          # Build Arm 32-bit OP-TEE rust examples
-          (cd ~/optee_client && make clean && make CROSS_COMPILE=$CROSS_COMPILE32 WITH_TEEACL=0)
+          # Build OP-TEE rust examples for Arm 64-bit host and 32-bit TA
           export TA_DEV_KIT_DIR=~/optee_os/out/arm-plat-vexpress/export-ta_arm32/
-          export OPTEE_CLIENT_EXPORT=~/optee_client/out/export/
-          make clean && make ARCH=arm CROSS_COMPILE=$CROSS_COMPILE32
+          export CROSS_COMPILE_HOST=$CROSS_COMPILE64
+          export CROSS_COMPILE_TA=$CROSS_COMPILE32
+          export TARGET_HOST="aarch64-unknown-linux-gnu"
+          export TARGET_TA="arm-unknown-linux-gnueabihf"
+          make clean && make
+
+          # Build OP-TEE rust examples for Arm 32-bit both host and TA
+          export TA_DEV_KIT_DIR=~/optee_os/out/arm-plat-vexpress/export-ta_arm32/
+          export CROSS_COMPILE_HOST=$CROSS_COMPILE32
+          export CROSS_COMPILE_TA=$CROSS_COMPILE32
+          export TARGET_HOST="arm-unknown-linux-gnueabihf"
+          export TARGET_TA="arm-unknown-linux-gnueabihf"
+          (cd ~/optee_client && make clean && make CROSS_COMPILE=$CROSS_COMPILE32 WITH_TEEACL=0)
+          make clean && make
+
+          # Build OP-TEE rust examples for Arm 32-bit host and 64-bit TA
+          export TA_DEV_KIT_DIR=~/optee_os/out/arm-plat-vexpress/export-ta_arm64/
+          export CROSS_COMPILE_HOST=$CROSS_COMPILE32
+          export CROSS_COMPILE_TA=$CROSS_COMPILE64
+          export TARGET_HOST="arm-unknown-linux-gnueabihf"
+          export TARGET_TA="aarch64-unknown-linux-gnu"
+          make clean && make
 
   build-and-run-examples-in-OPTEE-repo:
     runs-on: ubuntu-latest