mirrors/unleashed-firmware
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-12 12:42:30 +04:00
Code Issues Activity

fix ci, temp workaround for manifest

Browse Source
This commit is contained in:
MX
2023-11-17 02:35:27 +03:00
parent a64c9534e2
commit 12e736b283
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.drone.yml
View File

@@ -46,6 +46,8 @@ steps:
- export FBT_GIT_SUBMODULE_SHALLOW=1 - export FBT_GIT_SUBMODULE_SHALLOW=1
- wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-base.tgz - wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-base.tgz
- tar zxvf all-the-apps-base.tgz - tar zxvf all-the-apps-base.tgz
- mkdir -p applications/main/clock_app/resources/apps
- mkdir -p applications/main/clock_app/resources/apps_data
- cp -R base_pack_build/artifacts-base/* applications/main/clock_app/resources/apps/ - cp -R base_pack_build/artifacts-base/* applications/main/clock_app/resources/apps/
- cp -R base_pack_build/apps_data/* applications/main/clock_app/resources/apps_data/ - cp -R base_pack_build/apps_data/* applications/main/clock_app/resources/apps_data/
- rm -rf base_pack_build - rm -rf base_pack_build
@@ -66,6 +68,7 @@ steps:
commands: commands:
- wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-extra.tgz - wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-extra.tgz
- tar zxvf all-the-apps-extra.tgz - tar zxvf all-the-apps-extra.tgz
- mkdir -p applications/main/clock_app/resources/apps
- cp -R extra_pack_build/artifacts-extra/* applications/main/clock_app/resources/apps/ - cp -R extra_pack_build/artifacts-extra/* applications/main/clock_app/resources/apps/
- rm -rf extra_pack_build - rm -rf extra_pack_build
- export DIST_SUFFIX=${DRONE_TAG}e - export DIST_SUFFIX=${DRONE_TAG}e
@@ -118,6 +121,8 @@ steps:
- ./fbt COMPACT=1 DEBUG=0 updater_package - ./fbt COMPACT=1 DEBUG=0 updater_package
- wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-base.tgz - wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-base.tgz
- tar zxvf all-the-apps-base.tgz - tar zxvf all-the-apps-base.tgz
- mkdir -p applications/main/clock_app/resources/apps
- mkdir -p applications/main/clock_app/resources/apps_data
- cp -R base_pack_build/artifacts-base/* applications/main/clock_app/resources/apps/ - cp -R base_pack_build/artifacts-base/* applications/main/clock_app/resources/apps/
- cp -R base_pack_build/apps_data/* applications/main/clock_app/resources/apps_data/ - cp -R base_pack_build/apps_data/* applications/main/clock_app/resources/apps_data/
- rm -rf base_pack_build - rm -rf base_pack_build
@@ -421,6 +426,8 @@ steps:
- export FBT_GIT_SUBMODULE_SHALLOW=1 - export FBT_GIT_SUBMODULE_SHALLOW=1
- wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-base.tgz - wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-base.tgz
- tar zxvf all-the-apps-base.tgz - tar zxvf all-the-apps-base.tgz
- mkdir -p applications/main/clock_app/resources/apps
- mkdir -p applications/main/clock_app/resources/apps_data
- cp -R base_pack_build/artifacts-base/* applications/main/clock_app/resources/apps/ - cp -R base_pack_build/artifacts-base/* applications/main/clock_app/resources/apps/
- cp -R base_pack_build/apps_data/* applications/main/clock_app/resources/apps_data/ - cp -R base_pack_build/apps_data/* applications/main/clock_app/resources/apps_data/
- rm -rf base_pack_build - rm -rf base_pack_build
@@ -441,6 +448,7 @@ steps:
commands: commands:
- wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-extra.tgz - wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-extra.tgz
- tar zxvf all-the-apps-extra.tgz - tar zxvf all-the-apps-extra.tgz
- mkdir -p applications/main/clock_app/resources/apps
- cp -R extra_pack_build/artifacts-extra/* applications/main/clock_app/resources/apps/ - cp -R extra_pack_build/artifacts-extra/* applications/main/clock_app/resources/apps/
- rm -rf extra_pack_build - rm -rf extra_pack_build
- export DIST_SUFFIX=${DRONE_BUILD_NUMBER}e - export DIST_SUFFIX=${DRONE_BUILD_NUMBER}e

5
scripts/fbt/appmanifest.py
View File

@@ -166,7 +166,10 @@ class AppManager:
f"App {kw.get('appid')} of type {apptype} cannot have '{app_property}' in manifest" f"App {kw.get('appid')} of type {apptype} cannot have '{app_property}' in manifest"
) )
else: else:
for app_property in ("fap_extbuild", "fap_private_libs", "fap_icon_assets"): for app_property in (
"fap_extbuild",
"fap_private_libs",
): # , "fap_icon_assets"): TODO: Find a workaround for subghz_remote app
if kw.get(app_property): if kw.get(app_property):
raise FlipperManifestException( raise FlipperManifestException(
f"App {kw.get('appid')} of type {apptype} must not have '{app_property}' in manifest" f"App {kw.get('appid')} of type {apptype} must not have '{app_property}' in manifest"