From e482564bd15ef200cfb1e48d824ae3cbe2a6f8df Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Tue, 12 May 2026 01:10:13 +0200 Subject: [PATCH] Add executorch-ubuntu-24.04-gcc14 docker image It's necessary for XNNPACK on riscv64 to have a newer toolchain, to support the latest features of the hardware (RVV aka vectorization). --- .ci/docker/build.sh | 5 +++++ .ci/docker/common/install_user.sh | 5 +++++ .github/workflows/docker-builds.yml | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.ci/docker/build.sh b/.ci/docker/build.sh index 7c4a80044e4..0a4c6a6f757 100755 --- a/.ci/docker/build.sh +++ b/.ci/docker/build.sh @@ -84,6 +84,11 @@ case "${IMAGE_NAME}" in CUDA_VERSION=12.8 SKIP_PYTORCH=yes ;; + executorch-ubuntu-24.04-gcc14) + LINTRUNNER="" + OS_VERSION=24.04 + GCC_VERSION=14 + ;; *) echo "Invalid image name ${IMAGE_NAME}" exit 1 diff --git a/.ci/docker/common/install_user.sh b/.ci/docker/common/install_user.sh index f454c5d3ff6..9206d21cb9d 100755 --- a/.ci/docker/common/install_user.sh +++ b/.ci/docker/common/install_user.sh @@ -7,6 +7,11 @@ set -ex +# On Ubuntu 24.04, there is a `ubuntu` user with id=1000 +if id ubuntu >/dev/null && [[ "$(id -u ubuntu)" == 1000 ]]; then + sudo userdel --remove ubuntu; +fi + # Same as ec2-user echo "ci-user:x:1000:1000::/var/lib/ci-user:" >> /etc/passwd echo "ci-user:x:1000:" >> /etc/group diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml index 0f9778e9e69..b77e5497f79 100644 --- a/.github/workflows/docker-builds.yml +++ b/.github/workflows/docker-builds.yml @@ -41,7 +41,8 @@ jobs: executorch-ubuntu-22.04-zephyr-sdk, executorch-ubuntu-22.04-qnn-sdk, executorch-ubuntu-22.04-mediatek-sdk, - executorch-ubuntu-22.04-clang12-android + executorch-ubuntu-22.04-clang12-android, + executorch-ubuntu-24.04-gcc14, ] include: - docker-image-name: executorch-ubuntu-22.04-gcc11-aarch64