From 54c41e4189c662c65c3e0a50086e73dc532c9165 Mon Sep 17 00:00:00 2001
From: Anna Prosvetova <anna@prosvetova.me>
Date: Wed, 1 Dec 2021 13:21:26 +0300
Subject: [PATCH] CI: Remove pycache from artifacts (#858)

* CI: Remove pycache from artifacts

* CI: Move bundle scripts step even higher
---
 .github/workflows/build.yml | 22 +++++++++++-----------
 scripts/meta.py             |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 48a70686..c1cafd42 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -73,6 +73,11 @@ jobs:
           echo "::set-output name=short-hash::${SHA}"
           echo "::set-output name=default-target::${DEFAULT_TARGET}"
 
+      - name: 'Bundle scripts'
+        if: ${{ !github.event.pull_request.head.repo.fork }}
+        run: |
+          tar czpf artifacts/flipper-z-any-scripts-${{steps.names.outputs.suffix}}.tgz scripts
+
       - name: 'Build the firmware in docker'
         uses: ./.github/actions/docker
         with:
@@ -92,6 +97,12 @@ jobs:
               mv dist/${TARGET}/* artifacts/
             done
 
+      - name: 'Bundle resources'
+        if: ${{ !github.event.pull_request.head.repo.fork }}
+        run: |
+          ./scripts/assets.py manifest assets/resources
+          tar czpf artifacts/flipper-z-any-resources-${{steps.names.outputs.suffix}}.tgz -C assets resources
+
       - name: 'Bundle core2 firmware'
         if: ${{ !github.event.pull_request.head.repo.fork }}
         run: |
@@ -100,17 +111,6 @@ jobs:
           ./scripts/assets.py copro lib/STM32CubeWB core2_firmware STM32WB5x
           tar czpf artifacts/flipper-z-any-core2_firmware-${{steps.names.outputs.suffix}}.tgz core2_firmware
 
-      - name: 'Bundle scripts'
-        if: ${{ !github.event.pull_request.head.repo.fork }}
-        run: |
-          tar czpf artifacts/flipper-z-any-scripts-${{steps.names.outputs.suffix}}.tgz scripts
-
-      - name: 'Bundle resources'
-        if: ${{ !github.event.pull_request.head.repo.fork }}
-        run: |
-          ./scripts/assets.py manifest assets/resources
-          tar czpf artifacts/flipper-z-any-resources-${{steps.names.outputs.suffix}}.tgz -C assets resources
-
       - name: 'Upload artifacts to update server'
         if: ${{ !github.event.pull_request.head.repo.fork }}
         uses: burnett01/rsync-deployments@5.1
diff --git a/scripts/meta.py b/scripts/meta.py
index c3c4cac9..ae2f213b 100755
--- a/scripts/meta.py
+++ b/scripts/meta.py
@@ -35,7 +35,7 @@ class Main(App):
     def generate(self):
         meta = {}
         for k, v in vars(self.args).items():
-            if k == "project" or k == "func":
+            if k in ["project", "func", "debug"]:
                 continue
             if isinstance(v, str):
                 v = v.strip('"')