From 1992f39a169dd97abb1faa5b3b4bd9cbb0bf5cee Mon Sep 17 00:00:00 2001 From: Jerome Forissier Date: Tue, 17 Dec 2024 13:16:02 +0100 Subject: [PATCH] ci: update container Update the CI container to jforissier/optee_os_ci:qemu_check [1] which is the latest one, usable for both 32-bit and 64-bit ARM, and which is used by the optee_os CI [2]. This one should be able to build QEMU 9.2.0 without any issue contrary to the current one which causes: *** Ouch! *** found no usable tomli, please install it Link: https://github.com/jforissier/docker_optee_os_ci/tree/qemu_check [1] Link: https://github.com/OP-TEE/optee_os/blob/4.4.0/.github/workflows/ci.yml#L319 [2] Signed-off-by: Jerome Forissier Acked-by: Jens Wiklander Acked-by: Etienne Carriere --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 33e317c8d..ca23ecd2e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ jobs: QEMUv8_check: name: make check (QEMUv8) runs-on: ubuntu-latest - container: jforissier/optee_os_ci:qemuv8_check2 + container: jforissier/optee_os_ci:qemu_check steps: - name: Remove /__t/* run: rm -rf /__t/* @@ -29,7 +29,7 @@ jobs: WD=$(pwd) cd .. TOP=$(pwd)/optee_repo_qemu_v8 - /root/get_optee_qemuv8.sh ${TOP} + /root/get_optee.sh qemu_v8 ${TOP} mv ${TOP}/optee_test ${TOP}/optee_test_old ln -s ${WD} ${TOP}/optee_test cd ${TOP}/build