MX 2 лет назад
Родитель
Сommit
690afec210
1 измененных файлов с 7 добавлено и 5 удалено
  1. 7 5
      .drone.yml

+ 7 - 5
.drone.yml

@@ -20,7 +20,6 @@ steps:
     pull: never
     pull: never
     commands:
     commands:
       - git clone --branch dev https://github.com/DarkFlippers/unleashed-firmware.git
       - git clone --branch dev https://github.com/DarkFlippers/unleashed-firmware.git
-      - rm -rf unleashed-firmware/assets/resources/apps/
       - rm -rf unleashed-firmware/build/
       - rm -rf unleashed-firmware/build/
       - rm -rf unleashed-firmware/dist/
       - rm -rf unleashed-firmware/dist/
       - rm -rf unleashed-firmware/.sconsign.dblite
       - rm -rf unleashed-firmware/.sconsign.dblite
@@ -31,8 +30,10 @@ steps:
       - ./fbt COMPACT=1 DEBUG=0 updater_package
       - ./fbt COMPACT=1 DEBUG=0 updater_package
       - mkdir artifacts-base
       - mkdir artifacts-base
       - mkdir artifacts-totp
       - mkdir artifacts-totp
-      - mv assets/resources/apps/* artifacts-base/
-      - mv assets/resources/apps_data/totp/* artifacts-totp/
+      - mkdir dist/f7-C/f7-update-local/resources
+      - tar zxvf dist/f7-C/f7-update-local/resources.tar -C dist/f7-C/f7-update-local/resources
+      - mv dist/f7-C/f7-update-local/resources/apps/* artifacts-base/
+      - mv dist/f7-C/f7-update-local/resources/apps_data/totp/* artifacts-totp/
       - ls -laS artifacts-base
       - ls -laS artifacts-base
       - ls -laS artifacts-totp
       - ls -laS artifacts-totp
       - ls -laS artifacts-totp/plugins
       - ls -laS artifacts-totp/plugins
@@ -58,7 +59,6 @@ steps:
     image: hfdj/fztools
     image: hfdj/fztools
     pull: never
     pull: never
     commands:
     commands:
-      - rm -rf unleashed-firmware/assets/resources/apps/
       - rm -rf unleashed-firmware/build/
       - rm -rf unleashed-firmware/build/
       - rm -rf unleashed-firmware/dist/
       - rm -rf unleashed-firmware/dist/
       - rm -rf unleashed-firmware/.sconsign.dblite
       - rm -rf unleashed-firmware/.sconsign.dblite
@@ -69,7 +69,9 @@ steps:
       - export FBT_GIT_SUBMODULE_SHALLOW=1
       - export FBT_GIT_SUBMODULE_SHALLOW=1
       - ./fbt COMPACT=1 DEBUG=0 updater_package
       - ./fbt COMPACT=1 DEBUG=0 updater_package
       - mkdir artifacts-extra
       - mkdir artifacts-extra
-      - mv assets/resources/apps/* artifacts-extra/
+      - mkdir dist/f7-C/f7-update-local/resources
+      - tar zxvf dist/f7-C/f7-update-local/resources.tar -C dist/f7-C/f7-update-local/resources
+      - mv dist/f7-C/f7-update-local/resources/apps/* artifacts-extra/
       - ls -laS artifacts-extra
       - ls -laS artifacts-extra
       - rm -f artifacts-extra/GPIO/gpio.fap
       - rm -f artifacts-extra/GPIO/gpio.fap
       - rm -f artifacts-extra/iButton/ibutton.fap
       - rm -f artifacts-extra/iButton/ibutton.fap