dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

generate_board_targets: explicitly specify build containers 

in order to have the right container version for each toolchain
currently for the metadata deployment GitHub actions build.
This commit is contained in:
Matthias Grob 2023-07-18 19:18:01 +02:00 committed by Ramon Roche
parent ec9dce2e89
commit 013856fac1
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/deploy_all.yml vendored
View File

@ -24,7 +24,7 @@ jobs:
needs: enumerate_targets needs: enumerate_targets
strategy: strategy:
matrix: ${{fromJson(needs.enumerate_targets.outputs.matrix)}} matrix: ${{fromJson(needs.enumerate_targets.outputs.matrix)}}
container: px4io/px4-dev-${{ matrix.container }}:2021-09-08 container: ${{ matrix.container }}
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:

14
Tools/generate_board_targets_json.py
View File

@ -61,18 +61,19 @@ def process_target(px4board_file, target_name):
if platform not in excluded_platforms: if platform not in excluded_platforms:
# get the container based on the platform and toolchain # get the container based on the platform and toolchain
container = platform
if platform == 'posix': if platform == 'posix':
container = 'base-focal' container = 'px4io/px4-dev-base-focal:2021-09-08'
if toolchain: if toolchain:
if toolchain.startswith('aarch64'): if toolchain.startswith('aarch64'):
container = 'aarch64' container = 'px4io/px4-dev-aarch64:2021-09-08'
elif toolchain == 'arm-linux-gnueabihf': elif toolchain == 'arm-linux-gnueabihf':
container = 'armhf' container = 'px4io/px4-dev-armhf:2021-09-08'
else: else:
if verbose: print(f'possibly unmatched toolchain: {toolchain}') if verbose: print(f'unmatched toolchain: {toolchain}')
elif platform == 'nuttx': elif platform == 'nuttx':
container = 'nuttx-focal' container = 'px4io/px4-dev-nuttx-focal:2021-09-08'
else:
if verbose: print(f'unmatched platform: {platform}')
ret = {'target': target_name, 'container': container} ret = {'target': target_name, 'container': container}
@ -113,4 +114,3 @@ extra_args = {}
if args.pretty: if args.pretty:
extra_args['indent'] = 2 extra_args['indent'] = 2
print(json.dumps(github_action_config, **extra_args)) print(json.dumps(github_action_config, **extra_args))