mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-05-27 01:45:55 +08:00
style(format): apply astyle to Windows SITL changes
Run `make format` (astyle 3.1) over the Windows SITL touchpoint to satisfy CI `Gate Checks [check_format]`. The DEFINE_PARAMETERS_GROUPED macro continuation alignment and blank-line-after-early-return rules from astylerc were not applied during initial development; this commit brings them in for the affected files plus the windows_shim headers and Windows posix shim sources. Signed-off-by: Nuno Marques <n.marques21@hotmail.com>
This commit is contained in:
@@ -65,7 +65,14 @@ jobs:
|
||||
cmake ninja-build ccache \
|
||||
python3 python3-pip python3-jinja2 python3-yaml \
|
||||
python3-toml python3-numpy python3-packaging \
|
||||
python3-jsonschema python3-future
|
||||
python3-jsonschema python3-future \
|
||||
python3-kconfiglib python3-pyros-genmsg
|
||||
# PX4's msg/uxrce_dds/flight_tasks/zenoh generators rely on the
|
||||
# empy 3.x Interpreter API; install via pip (with --break-system-
|
||||
# packages on Ubuntu 24.04 where pip refuses to touch system
|
||||
# site-packages by default).
|
||||
python3 -m pip install --user --break-system-packages "empy>=3.3,<4" || \
|
||||
python3 -m pip install --user "empy>=3.3,<4"
|
||||
|
||||
- name: Setup ccache (MinGW)
|
||||
if: matrix.toolchain == 'MinGW'
|
||||
@@ -98,6 +105,9 @@ jobs:
|
||||
# em.BUFFERED_OPT: True}) API removed in empy 4.x. Matches the pin
|
||||
# in Tools/setup/requirements.txt and Tools/setup/windows.ps1.
|
||||
python -m pip install jinja2 pyyaml toml numpy packaging jsonschema future "empy>=3.3,<4" pyros-genmsg kconfiglib
|
||||
# Verify kconfiglib import on the same Python that CMake will pick
|
||||
# so we fail loud here rather than deep in cmake configure.
|
||||
python -c "import menuconfig; print(menuconfig.__file__)"
|
||||
|
||||
- name: Install Ninja (MSVC)
|
||||
if: matrix.toolchain == 'MSVC'
|
||||
@@ -119,9 +129,15 @@ jobs:
|
||||
# Makefile's existing Ninja branch picks the Ninja generator and
|
||||
# cmake auto-detects MSVC as the host compiler — same entry point
|
||||
# as Linux/macOS, no toolchain file needed.
|
||||
#
|
||||
# Pin Python3_ROOT_DIR to the setup-python interpreter so cmake's
|
||||
# find_package(Python3) does not pick up the runner-image's other
|
||||
# Python (3.12) where kconfiglib is not installed.
|
||||
- name: Native-build px4.exe (MSVC)
|
||||
if: matrix.toolchain == 'MSVC'
|
||||
shell: bash
|
||||
env:
|
||||
CMAKE_ARGS: -DPython3_ROOT_DIR=${{ env.pythonLocation }} -DPython3_FIND_STRATEGY=LOCATION
|
||||
run: make px4_sitl_default
|
||||
|
||||
# ---- Common ----
|
||||
|
||||
Reference in New Issue
Block a user