Skip to content

Commit

Permalink
change(ci): test build ncp host example via non_pytest job
Browse files Browse the repository at this point in the history
Signed-off-by: Pengyu Lv <[email protected]>
  • Loading branch information
lpy4105 committed Nov 4, 2024
1 parent 731f778 commit 451f843
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 28 deletions.
13 changes: 0 additions & 13 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,6 @@ build_non_pytest_examples:
tags:
- build

build_non_pytest_host:
stage: build
image: ${CI_DOCKER_REGISTRY}/esp-env-v5.3:1
artifacts:
when: always
expire_in: 4 days
script:
- *update_zigbee_lib_script
- cd ${ESP_ZIGBEE_SDK_PATH}
- python tools/ci/build_apps.py ./examples --host
tags:
- build

build_pytest_examples:
stage: build
image: ${CI_DOCKER_REGISTRY}/esp-env-v5.3:1
Expand Down
16 changes: 1 addition & 15 deletions tools/ci/build_apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,6 @@

GATEWAY_APPS = [{"target": "esp32h2", "name": "esp_zigbee_all_device_types_app"},]

HOST_APPS = [{"target": "esp32", "name": "esp_zigbee_host"},
{"target": "esp32s2", "name": "esp_zigbee_host"},
{"target": "esp32c3", "name": "esp_zigbee_host"},
{"target": "esp32s3", "name": "esp_zigbee_host"},
{"target": "esp32h2", "name": "esp_zigbee_host"},
{"target": "esp32c6", "name": "esp_zigbee_host"}, ]

IGNORE_WARNINGS = [
r"warning: 'init_spiffs' defined but not used",
Expand Down Expand Up @@ -93,14 +87,11 @@ def main(args: argparse.Namespace) -> None:
assert not (args.no_pytest and args.pytest)
if args.no_pytest:
apps_for_build = [app for app in apps if not (_is_pytest_app(app, PYTEST_APPS)
or _is_pytest_app(app, GATEWAY_APPS)
or _is_pytest_app(app, HOST_APPS))]
or _is_pytest_app(app, GATEWAY_APPS))]
elif args.pytest:
apps_for_build = [app for app in apps if _is_pytest_app(app, PYTEST_APPS)]
elif args.rcp_gateway:
apps_for_build = [app for app in apps if _is_pytest_app(app, GATEWAY_APPS)]
elif args.host:
apps_for_build = [app for app in apps if _is_pytest_app(app, HOST_APPS)]
else:
apps_for_build = apps[:]

Expand Down Expand Up @@ -178,11 +169,6 @@ def main(args: argparse.Namespace) -> None:
action="store_true",
help='Only build rcp_gateway pytest apps, defined in GATEWAY_APPS',
)
parser.add_argument(
'--host',
action="store_true",
help='Only build host apps, defined in HOST_APPS',
)

arguments = parser.parse_args()
if not arguments.paths:
Expand Down

0 comments on commit 451f843

Please sign in to comment.