Merge branch 'dev' into release

DarkFlippers · Aug 17, 2023 · 5b578cf · 5b578cf
2 parents dafea08 + 4d5a900
commit 5b578cf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -114,6 +114,7 @@ steps:
       - cp -R base_pack_build/artifacts-base/* assets/resources/apps/
       - rm -rf base_pack_build
       - rm -rf all-the-apps-base.tgz
+      - rm -f build/f7-firmware-C/toolbox/version.*
       - ./fbt COMPACT=1 DEBUG=0 updater_package
       - mkdir artifacts-ofw-anims
       - mv dist/f7-C/* artifacts-ofw-anims/

diff --git a/.gitignore b/.gitignore
@@ -51,6 +51,7 @@ null.d
 /artifacts-ofw-anims
 /artifacts-rgb-patch
 /artifacts-extra-apps
+/artifacts-clean
 
 # SCons build dir
 /build