@@ -19,7 +19,7 @@ OS=ubuntu
 OS_VERSION=22.04
 CLANG_VERSION=""
 GCC_VERSION=""
-PYTHON_VERSION=3.10
+PYTHON_VERSION=3.11
 MINICONDA_VERSION=23.10.0-1
 BUCK2_VERSION=$(cat ci_commit_pins/buck2.txt)
 
@@ -58,6 +58,13 @@ case "${IMAGE_NAME}" in
     ARM_SDK=yes
     CLANG_VERSION=12
     ;;
+  executorch-ubuntu-24.04-arm-sdk)
+    OS_VERSION=24.04
+    ARM_SDK=yes
+    CLANG_VERSION=18
+    PYTHON_VERSION=3.12
+    MINICONDA_VERSION=24.1.2-0
+    ;;
   executorch-ubuntu-22.04-zephyr-sdk)
     ZEPHYR_SDK=yes
     GCC_VERSION=11
@@ -109,7 +116,16 @@ fi
 # Copy requirements-lintrunner.txt from root to here
 cp ../../requirements-lintrunner.txt ./
 
-docker build \
+# OSDC runners have no docker daemon, so the build runs on the in-cluster
+# BuildKit pool via a remote buildx builder. That builder has nowhere to load
+# an image into, so the result has to go straight to the registry.
+if [[ -n "${REMOTE_BUILDKIT:-}" ]]; then
+  BUILD_CMD=(docker buildx build --push)
+else
+  BUILD_CMD=(docker build)
+fi
+
+"${BUILD_CMD[@]}" \
   --no-cache \
   --progress=plain \
   --build-arg "OS_VERSION=${OS_VERSION}" \
 
@@ -1 +1 @@
-release/2.12
+e91899ca45f99811049ac7d539820f92a9acddde
@@ -79,10 +79,9 @@ install_sdk() {
   yes | /opt/cmdline-tools/bin/sdkmanager --sdk_root="${SDK_INSTALLATION_DIR}" --install "build-tools;35.0.0"
   # And some more tools for future emulator tests
   yes | /opt/cmdline-tools/bin/sdkmanager --sdk_root="${SDK_INSTALLATION_DIR}" --install "platform-tools"
-  # The 'tools' package (emulator) is not available on aarch64
-  if [ "$(uname -m)" != "aarch64" ]; then
-    yes | /opt/cmdline-tools/bin/sdkmanager --sdk_root="${SDK_INSTALLATION_DIR}" --install "tools"
-  fi
+  # Google withdrew the 'tools' package, so installing it fails under set -e.
+  # cmdline-tools and platform-tools above replace it, and this image neither
+  # installs nor runs an emulator.
 }
 
 install_prerequiresites
 
@@ -20,7 +20,9 @@ if [ -n "$BUILD_DOCS" ]; then
 
   apt-get update
   apt-get install -y --no-install-recommends yarn
-  yarn global add katex --prefix /usr/local
+  # katex 0.18.5 requires commander@15 / node >= 22.12; pin to the last
+  # release compatible with the node 16 installed above
+  yarn global add katex@0.18.4 --prefix /usr/local
 
   sudo apt-get -y install doxygen
 
 
@@ -5,8 +5,10 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
-# NB: This script is needed for sccache and is adopted from PyTorch core repo at
-# https://github.com/pytorch/pytorch/blob/main/.ci/docker/common/install_openssl.sh
+# NB: This script is needed for sccache and is adopted from PyTorch core repo.
+# Core deleted its copy in pytorch/pytorch#179513, so this points at the last
+# revision that still had it instead of at a branch.
+# https://github.com/pytorch/pytorch/blob/9274b93eac9f026e9f51e282449b0300b8e05482/.ci/docker/common/install_openssl.sh
 set -ex
 
 OPENSSL=openssl-1.1.1k
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-release/2.12`
	`1`	`+e91899ca45f99811049ac7d539820f92a9acddde`