Skip to content

ci/docker: add Raspberry Pi picotool and fix GN build #17039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoxiang781216 merged 1 commit into from
Sep 19, 2025
Merged

ci/docker: add Raspberry Pi picotool and fix GN build #17039

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions tools/ci/docker/linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -q
nodejs \
npm \
unzip \
zip
zip \
python3

RUN mkdir -p /tools
WORKDIR /tools
Expand All @@ -67,8 +68,10 @@ RUN cd nuttx-tools/kconfig-frontends \
RUN mkdir -p /tools/gn \
&& cd /tools/gn \
&& git clone https://gn.googlesource.com/gn gn \
&& cd gn && ./build/gen.py \
&& cd out && ninja
&& cd gn \
&& git checkout 5d0a4153b0bcc86c5a23310d5b648a587be3c56d \
&& python3 build/gen.py \
&& ninja -C out

# Upgrade nodejs to the stable version we need before install zap
RUN npm install -g n && n 20.10.0 node && hash -r
Expand Down Expand Up @@ -302,6 +305,15 @@ RUN mkdir -p pico-sdk && \
curl -s -L "https://github.com/raspberrypi/pico-sdk/releases/download/2.2.0/pico-sdk-2.2.0.tar.gz" \
| tar -C pico-sdk --strip-components 1 -xz

###############################################################################
# Build image for tool required by Raspberry Pi picotool builds
###############################################################################
FROM nuttx-toolchain-base AS nuttx-toolchain-raspberrypi-picotool
# Download the prebuilt Raspberry Pi picotool
RUN mkdir -p picotool && \
curl -s -L "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-0/picotool-2.2.0-x86_64-lin.tar.gz" \
| tar -C picotool --strip-components 1 -xz

###############################################################################
# Final Docker image used for running CI system. This includes all toolchains
# supported by the CI system.
Expand Down Expand Up @@ -493,6 +505,10 @@ COPY --from=nuttx-toolchain-esp32 /tools/blobs/* /tools/blobs/esp-bins/
COPY --from=nuttx-toolchain-raspberrypi-pico-sdk /tools/pico-sdk/ pico-sdk/
ENV PICO_SDK_PATH="/tools/pico-sdk"

# Raspberry Pi picotool
COPY --from=nuttx-toolchain-raspberrypi-picotool /tools/picotool/ picotool/
ENV PATH="/tools/picotool:$PATH"

# gn tool
RUN mkdir -p /tools/gn
COPY --from=nuttx-tools /tools/gn/gn/out/gn /tools/gn
Expand Down