Skip to content

Commit 12e736b

Browse files
committed
fix ci, temp workaround for manifest
1 parent a64c953 commit 12e736b

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

.drone.yml

+8
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ steps:
4646
- export FBT_GIT_SUBMODULE_SHALLOW=1
4747
- wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-base.tgz
4848
- tar zxvf all-the-apps-base.tgz
49+
- mkdir -p applications/main/clock_app/resources/apps
50+
- mkdir -p applications/main/clock_app/resources/apps_data
4951
- cp -R base_pack_build/artifacts-base/* applications/main/clock_app/resources/apps/
5052
- cp -R base_pack_build/apps_data/* applications/main/clock_app/resources/apps_data/
5153
- rm -rf base_pack_build
@@ -66,6 +68,7 @@ steps:
6668
commands:
6769
- wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-extra.tgz
6870
- tar zxvf all-the-apps-extra.tgz
71+
- mkdir -p applications/main/clock_app/resources/apps
6972
- cp -R extra_pack_build/artifacts-extra/* applications/main/clock_app/resources/apps/
7073
- rm -rf extra_pack_build
7174
- export DIST_SUFFIX=${DRONE_TAG}e
@@ -118,6 +121,8 @@ steps:
118121
- ./fbt COMPACT=1 DEBUG=0 updater_package
119122
- wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-base.tgz
120123
- tar zxvf all-the-apps-base.tgz
124+
- mkdir -p applications/main/clock_app/resources/apps
125+
- mkdir -p applications/main/clock_app/resources/apps_data
121126
- cp -R base_pack_build/artifacts-base/* applications/main/clock_app/resources/apps/
122127
- cp -R base_pack_build/apps_data/* applications/main/clock_app/resources/apps_data/
123128
- rm -rf base_pack_build
@@ -421,6 +426,8 @@ steps:
421426
- export FBT_GIT_SUBMODULE_SHALLOW=1
422427
- wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-base.tgz
423428
- tar zxvf all-the-apps-base.tgz
429+
- mkdir -p applications/main/clock_app/resources/apps
430+
- mkdir -p applications/main/clock_app/resources/apps_data
424431
- cp -R base_pack_build/artifacts-base/* applications/main/clock_app/resources/apps/
425432
- cp -R base_pack_build/apps_data/* applications/main/clock_app/resources/apps_data/
426433
- rm -rf base_pack_build
@@ -441,6 +448,7 @@ steps:
441448
commands:
442449
- wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-extra.tgz
443450
- tar zxvf all-the-apps-extra.tgz
451+
- mkdir -p applications/main/clock_app/resources/apps
444452
- cp -R extra_pack_build/artifacts-extra/* applications/main/clock_app/resources/apps/
445453
- rm -rf extra_pack_build
446454
- export DIST_SUFFIX=${DRONE_BUILD_NUMBER}e

scripts/fbt/appmanifest.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,10 @@ def _validate_app_params(self, *args, **kw):
166166
f"App {kw.get('appid')} of type {apptype} cannot have '{app_property}' in manifest"
167167
)
168168
else:
169-
for app_property in ("fap_extbuild", "fap_private_libs", "fap_icon_assets"):
169+
for app_property in (
170+
"fap_extbuild",
171+
"fap_private_libs",
172+
): # , "fap_icon_assets"): TODO: Find a workaround for subghz_remote app
170173
if kw.get(app_property):
171174
raise FlipperManifestException(
172175
f"App {kw.get('appid')} of type {apptype} must not have '{app_property}' in manifest"

0 commit comments

Comments
 (0)