mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-11-22 14:19:57 +08:00
ci(px4io): keep one IO firmware binary per IO board and check it in CI
The px4io firmware was committed as a copy in the extras of each of the 30 boards using it. "make px4io_update" only knew about 15 of them, so the copies drifted into 5 different versions, and none had been regenerated since 2024-03 despite changes to px4iofirmware, lib/rc and NuttX. Keep a single binary per IO board in boards/<vendor>/<io board>/extras and let the ROMFS pick it via the existing CONFIG_BOARD_IO option, which every board with the px4io driver already sets (cubepilot boards override it). This also replaces the outdated per-board copies on boards that were missed by "make px4io_update". The IO build is reproducible with a fixed toolchain (verified across checkout paths and container vs host with the same GCC), so CI can rebuild it and compare. "make check_px4io" does that, and a new CI job turns a mismatch into a warning. Assisted-by: Claude:claude-opus-5-5 Signed-off-by: Julian Oes <julian@oes.ch>
This commit is contained in:
1 parent
f8e80858ad
commit
a88edf1abe
34 files changed
+73
-51
No files matched your search
@@ -48,6 +48,46 @@ jobs:
|
||||
PX4_SBOM_DISABLE: 1
|
||||
run: make ${{ matrix.check }}
|
||||
|
||||
# The committed px4io firmware binaries must match what the current sources build to.
|
||||
# The build is reproducible with a fixed toolchain, so a mismatch means a dependency
|
||||
# changed without "make px4io_update". This only warns, it does not fail the job.
|
||||
px4io_firmware:
|
||||
name: IO Firmware Up To Date
|
||||
runs-on: [runs-on,runner=2cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false,extras=s3-cache]
|
||||
container:
|
||||
# keep in sync with the image named in the warning below
|
||||
image: ghcr.io/px4/px4-dev:v1.17.0-rc2
|
||||
steps:
|
||||
- uses: runs-on/action@v2
|
||||
- uses: actions/checkout@v6
|
||||
with:
|
||||
fetch-depth: 1
|
||||
- name: Configure Git Safe Directory
|
||||
run: git config --system --add safe.directory '*'
|
||||
|
||||
- name: Build px4io firmware
|
||||
env:
|
||||
PX4_SBOM_DISABLE: 1
|
||||
run: make px4io_update
|
||||
|
||||
- name: Compare with committed binaries
|
||||
env:
|
||||
PX4_SBOM_DISABLE: 1
|
||||
run: |
|
||||
if ! make check_px4io; then
|
||||
image="ghcr.io/px4/px4-dev:v1.17.0-rc2"
|
||||
echo "::warning title=px4io firmware out of date::The committed px4io firmware does not match the current sources. Regenerate it with: PX4_DOCKER_REPO=${image} ./Tools/docker_run.sh 'make px4io_update'"
|
||||
{
|
||||
echo "### px4io firmware out of date"
|
||||
echo
|
||||
echo "The committed px4io firmware does not match what the current sources build to. Regenerate and commit it:"
|
||||
echo
|
||||
echo '```'
|
||||
echo "PX4_DOCKER_REPO=${image} ./Tools/docker_run.sh 'make px4io_update'"
|
||||
echo '```'
|
||||
} >> "$GITHUB_STEP_SUMMARY"
|
||||
fi
|
||||
|
||||
tests:
|
||||
name: Unit Tests
|
||||
runs-on: [runs-on,runner=8cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false,extras=s3-cache]
|
||||
|
||||
@@ -335,27 +335,25 @@ uorb_graphs:
|
||||
@$(MAKE) --no-print-directory px4_fmu-v6x_default uorb_graph
|
||||
@$(MAKE) --no-print-directory px4_sitl_default uorb_graph
|
||||
|
||||
# The px4io firmware is committed once per IO board and embedded into the ROMFS of every
|
||||
# board with CONFIG_BOARD_IO set. The build is reproducible, but only with the same
|
||||
# toolchain, so regenerate it in the px4-dev image used by the check_px4io CI job
|
||||
# (.github/workflows/checks.yml):
|
||||
# PX4_DOCKER_REPO=<that image> ./Tools/docker_run.sh 'make px4io_update'
|
||||
.PHONY: px4io_update check_px4io
|
||||
PX4IO_FIRMWARE_BINS := \
|
||||
boards/px4/io-v2/extras/px4_io-v2_default.bin \
|
||||
boards/cubepilot/io-v2/extras/cubepilot_io-v2_default.bin
|
||||
|
||||
px4io_update:
|
||||
@$(MAKE) --no-print-directory px4_io-v2_default
|
||||
@$(MAKE) --no-print-directory cubepilot_io-v2_default
|
||||
# px4_io-v2_default
|
||||
cp build/px4_io-v2_default/px4_io-v2_default.bin boards/ark/fmu-v6x/extras/px4_io-v2_default.bin
|
||||
cp build/px4_io-v2_default/px4_io-v2_default.bin boards/holybro/durandal-v1/extras/px4_io-v2_default.bin
|
||||
cp build/px4_io-v2_default/px4_io-v2_default.bin boards/holybro/pix32v5/extras/px4_io-v2_default.bin
|
||||
cp build/px4_io-v2_default/px4_io-v2_default.bin boards/mro/x21/extras/px4_io-v2_default.bin
|
||||
cp build/px4_io-v2_default/px4_io-v2_default.bin boards/mro/x21-777/extras/px4_io-v2_default.bin
|
||||
cp build/px4_io-v2_default/px4_io-v2_default.bin boards/px4/fmu-v2/extras/px4_io-v2_default.bin
|
||||
cp build/px4_io-v2_default/px4_io-v2_default.bin boards/px4/fmu-v3/extras/px4_io-v2_default.bin
|
||||
cp build/px4_io-v2_default/px4_io-v2_default.bin boards/px4/fmu-v4pro/extras/px4_io-v2_default.bin
|
||||
cp build/px4_io-v2_default/px4_io-v2_default.bin boards/px4/fmu-v5/extras/px4_io-v2_default.bin
|
||||
cp build/px4_io-v2_default/px4_io-v2_default.bin boards/px4/fmu-v5x/extras/px4_io-v2_default.bin
|
||||
cp build/px4_io-v2_default/px4_io-v2_default.bin boards/px4/fmu-v6x/extras/px4_io-v2_default.bin
|
||||
cp build/px4_io-v2_default/px4_io-v2_default.bin boards/px4/fmu-v6c/extras/px4_io-v2_default.bin
|
||||
# cubepilot_io-v2_default
|
||||
cp build/cubepilot_io-v2_default/cubepilot_io-v2_default.bin boards/cubepilot/cubeorange/extras/cubepilot_io-v2_default.bin
|
||||
cp build/cubepilot_io-v2_default/cubepilot_io-v2_default.bin boards/cubepilot/cubeorangeplus/extras/cubepilot_io-v2_default.bin
|
||||
cp build/cubepilot_io-v2_default/cubepilot_io-v2_default.bin boards/cubepilot/cubeyellow/extras/cubepilot_io-v2_default.bin
|
||||
git status
|
||||
cp build/px4_io-v2_default/px4_io-v2_default.bin boards/px4/io-v2/extras/
|
||||
cp build/cubepilot_io-v2_default/cubepilot_io-v2_default.bin boards/cubepilot/io-v2/extras/
|
||||
|
||||
check_px4io: px4io_update
|
||||
@git diff --exit-code --stat -- $(PX4IO_FIRMWARE_BINS) \
|
||||
|| { echo "px4io firmware is out of date, regenerate it with 'make px4io_update' (see Makefile)"; exit 1; }
|
||||
|
||||
bootloaders_update: \
|
||||
3dr_ctrl-n1_bootloader \
|
||||
|
||||
+16
-7
@@ -296,18 +296,27 @@ foreach(board_extra_file ${OPTIONAL_BOARD_EXTRAS})
|
||||
# remove bootloader from extras
|
||||
list(REMOVE_ITEM OPTIONAL_BOARD_EXTRAS ${board_extra_file})
|
||||
endif()
|
||||
elseif(${extra_file_base_name} MATCHES "_io-v[0-9]+_default\\.bin$")
|
||||
# px4io firmware: only the px4io driver can use it
|
||||
if(NOT CONFIG_DRIVERS_PX4IO)
|
||||
list(REMOVE_ITEM OPTIONAL_BOARD_EXTRAS ${board_extra_file})
|
||||
endif()
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
# px4io firmware (optional)
|
||||
# - the binary is kept once per IO board, in boards/<vendor>/<model>/extras/<CONFIG_BOARD_IO>.bin
|
||||
# - regenerate it with "make px4io_update", CI checks it with "make check_px4io"
|
||||
if(CONFIG_DRIVERS_PX4IO AND CONFIG_BOARD_IO)
|
||||
if(NOT CONFIG_BOARD_IO MATCHES "^([^_]+)_(.+)_([^_]+)$")
|
||||
message(FATAL_ERROR "BOARD_IO '${CONFIG_BOARD_IO}' is not of the form <vendor>_<model>_<label>")
|
||||
endif()
|
||||
set(px4io_firmware_bin ${PX4_SOURCE_DIR}/boards/${CMAKE_MATCH_1}/${CMAKE_MATCH_2}/extras/${CONFIG_BOARD_IO}.bin)
|
||||
if(NOT EXISTS ${px4io_firmware_bin})
|
||||
message(FATAL_ERROR "px4io firmware not found at: ${px4io_firmware_bin} (run make px4io_update)")
|
||||
endif()
|
||||
list(APPEND OPTIONAL_BOARD_EXTRAS ${px4io_firmware_bin})
|
||||
endif()
|
||||
|
||||
foreach(board_extra_file ${OPTIONAL_BOARD_EXTRAS})
|
||||
|
||||
if(EXISTS "${board_extra_file}")
|
||||
file(RELATIVE_PATH extra_file_base_name ${PX4_BOARD_DIR}/extras/ ${board_extra_file})
|
||||
get_filename_component(extra_file_base_name ${board_extra_file} NAME)
|
||||
file(RELATIVE_PATH extra_file_relative_source ${PX4_SOURCE_DIR} ${board_extra_file})
|
||||
message(STATUS "ROMFS: Adding ${extra_file_relative_source} -> /etc/extras/${extra_file_base_name}")
|
||||
|
||||
@@ -315,7 +324,7 @@ foreach(board_extra_file ${OPTIONAL_BOARD_EXTRAS})
|
||||
OUTPUT
|
||||
${romfs_gen_root_dir}/extras/${extra_file_base_name}
|
||||
${extra_file_base_name}.stamp
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PX4_BOARD_DIR}/extras/${extra_file_base_name} ${romfs_gen_root_dir}/extras/${extra_file_base_name}
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${board_extra_file} ${romfs_gen_root_dir}/extras/${extra_file_base_name}
|
||||
COMMAND ${CMAKE_COMMAND} -E touch ${extra_file_base_name}.stamp
|
||||
DEPENDS
|
||||
${board_extra_file}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File renamed without changes.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File renamed without changes.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -50,29 +50,4 @@ px4_add_module(
|
||||
px4io_protocol
|
||||
)
|
||||
|
||||
# include the px4io binary in ROMFS
|
||||
if(CONFIG_BOARD_IO)
|
||||
message(STATUS "drivers/px4io: ROMFS including ${CONFIG_BOARD_IO}")
|
||||
|
||||
include(ExternalProject)
|
||||
|
||||
ExternalProject_Add(px4io_firmware_build
|
||||
DOWNLOAD_COMMAND rsync -a --safe-links --delete --exclude=build --exclude=*.o --exclude=*.a --exclude=.config ${PX4_SOURCE_DIR}/ ${PX4_BINARY_DIR}/external/Source/px4io_firmware_build/
|
||||
UPDATE_COMMAND rsync -a --safe-links --delete --exclude=build --exclude=*.o --exclude=*.a --exclude=.config ${PX4_SOURCE_DIR}/ ${PX4_BINARY_DIR}/external/Source/px4io_firmware_build/
|
||||
DEPENDS git_nuttx git_nuttx_apps
|
||||
SOURCE_DIR ${PX4_BINARY_DIR}/external/Source/px4io_firmware_build/
|
||||
CMAKE_ARGS -DCONFIG=${CONFIG_BOARD_IO}
|
||||
INSTALL_COMMAND ""
|
||||
USES_TERMINAL_BUILD true
|
||||
EXCLUDE_FROM_ALL true
|
||||
BUILD_ALWAYS true
|
||||
)
|
||||
|
||||
ExternalProject_Get_Property(px4io_firmware_build BINARY_DIR)
|
||||
|
||||
add_custom_target(px4io_firmware_update
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${BINARY_DIR}/${CONFIG_BOARD_IO}.bin ${PX4_BOARD_DIR}/extras/${CONFIG_BOARD_IO}.bin
|
||||
DEPENDS px4io_firmware_build
|
||||
COMMENT "Copying ${CONFIG_BOARD_IO} to board extras"
|
||||
)
|
||||
endif()
|
||||
# The px4io firmware binary is added to ROMFS by ROMFS/CMakeLists.txt (see CONFIG_BOARD_IO).
|
||||
Reference in new issue
Block a user