Skip to content

Commit d5a79a7

Browse files
committed
applications: radon: Fix Github CI
Signed-off-by: Karel Blavka <[email protected]>
1 parent 3dee02d commit d5a79a7

File tree

6 files changed

+16
-8
lines changed

6 files changed

+16
-8
lines changed

.github/gen-applications.py

+5
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ def panic(msg):
3333
project_yml_path = os.path.join(path, '../applications', name , 'project.yaml')
3434
if os.path.exists(project_yml_path):
3535
project = yaml.safe_load(open(project_yml_path, 'r'))
36+
if not project.get('variants', None):
37+
if out == 'cmd':
38+
print(f'rm -rf build && west chester-update && west build')
39+
sys.exit(0)
40+
3641
for variant in project['variants']:
3742
if variant['fw_bundle'] == fw_bundle:
3843
# print(json.dumps(variant, sort_keys=True))

.github/gen-matrix.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,14 @@ def panic(msg):
2626
project_yml_path = os.path.join(path, '../applications', name , 'project.yaml')
2727
if os.path.exists(project_yml_path):
2828
project = yaml.safe_load(open(project_yml_path, 'r'))
29+
if not 'project' in project:
30+
panic(f"Project {name} has no project key")
31+
2932
if not project.get('variants', None):
30-
panic(f"Project {name} has no variants")
33+
project['variants'] = [project['project']]
34+
3135
for variant in project['variants']:
32-
fw_bundle = variant.get('fw_bundle', '')
36+
fw_bundle = variant.get('fw_bundle', None)
3337
if name not in fw_bundle:
3438
panic(f"Invalid fw_bundle name: name: {name} variant {variant['name']}")
3539
if not fw_bundle.startswith(PREFIX):

applications/radon/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
cmake_minimum_required(VERSION 3.20.0)
88

9-
set(ENV{FW_BUNDLE} "None")
9+
set(ENV{FW_BUNDLE} "com.hardwario.chester.app.radon")
1010
set(ENV{FW_VERSION} "v2.1.0")
1111
set(ENV{FW_NAME} "CHESTER Radon")
1212

applications/radon/Kconfig.variant

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
# SPDX-License-Identifier: LicenseRef-HARDWARIO-5-Clause
55
#
66

7-
config VARIANT_TEMPLATE
8-
bool "Enable VARIANT_TEMPLATE"
7+
config VARIANT_RADON
8+
bool "Enable VARIANT_RADON"
99
default y

applications/radon/prj.conf

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ CONFIG_CTR_CLOUD=y
2222
CONFIG_SETTINGS_SHELL=y
2323
CONFIG_IMG_MANAGER=y
2424
CONFIG_BOOTLOADER_MCUBOOT=y
25-
CONFIG_PM_PARTITION_SIZE_SETTINGS_STORAGE=0x8000
2625
CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
2726
CONFIG_SPI=y
2827
CONFIG_DFU_TARGET=y

applications/radon/project.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
version: 1
22
project:
3-
variant: Template
3+
variant: Radon
44
company: 2024 HARDWARIO a.s.
55
license: "SPDX-License-Identifier: LicenseRef-HARDWARIO-5-Clause"
66
fw_name: CHESTER Radon
7-
fw_bundle:
7+
fw_bundle: com.hardwario.chester.app.radon
88
fw_version: v2.1.0
99
features:
1010
- subsystem-accel

0 commit comments

Comments
 (0)