mount/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: check for uncommited changes after build (#1461)

Browse Source 
* ci: check for uncommited changes after build
* assets: updated Manifest to match sources
* ci: simplified uncommited files check
* resources: Updated Manifest
* fbt: always rebuild manifest

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
hedger 2022-08-02 16:29:16 +03:00 committed by GitHub
parent 01afb289c0
commit 1e732830ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -106,6 +106,10 @@ jobs:
rm -rf artifacts/${BUNDLE_NAME} rm -rf artifacts/${BUNDLE_NAME}
done done
- name: "Check for uncommited changes"
run: |
git diff --exit-code
- name: 'Bundle resources' - name: 'Bundle resources'
if: ${{ !github.event.pull_request.head.repo.fork }} if: ${{ !github.event.pull_request.head.repo.fork }}
run: | run: |

1
assets/SConscript
View File

@ -103,7 +103,6 @@ if assetsenv["IS_BASE_FIRMWARE"]:
) )
assetsenv.Precious(resources) assetsenv.Precious(resources)
assetsenv.NoClean(resources) assetsenv.NoClean(resources)
if assetsenv["FORCE"]:
assetsenv.AlwaysBuild(resources) assetsenv.AlwaysBuild(resources)
# Exporting resources node to external environment # Exporting resources node to external environment

6
assets/resources/Manifest
View File

@ -1,5 +1,5 @@
V:0 V:0
T:1655152832 T:1658906571
D:badusb D:badusb
D:dolphin D:dolphin
D:infrared D:infrared
@ -232,10 +232,10 @@ F:41b4f08774249014cb8d3dffa5f5c07d:1757:nfc/assets/currency_code.nfc
F:c60e862919731b0bd538a1001bbc1098:17453:nfc/assets/mf_classic_dict.nfc F:c60e862919731b0bd538a1001bbc1098:17453:nfc/assets/mf_classic_dict.nfc
D:subghz/assets D:subghz/assets
F:dda1ef895b8a25fde57c874feaaef997:650:subghz/assets/came_atomo F:dda1ef895b8a25fde57c874feaaef997:650:subghz/assets/came_atomo
F:610a0ffa2479a874f2060eb2348104c5:2712:subghz/assets/keeloq_mfcodes F:788eef2cc74e29f3388463d6607dab0d:3264:subghz/assets/keeloq_mfcodes
F:9214f9c10463b746a27e82ce0b96e040:465:subghz/assets/keeloq_mfcodes_user F:9214f9c10463b746a27e82ce0b96e040:465:subghz/assets/keeloq_mfcodes_user
F:653bd8d349055a41e1152e557d4a52d3:202:subghz/assets/nice_flor_s F:653bd8d349055a41e1152e557d4a52d3:202:subghz/assets/nice_flor_s
F:c6ec4374275cd20f482ecd46de9f53e3:528:subghz/assets/setting_user F:c1c63fbd5f5aa3ea504027014652191f:1150:subghz/assets/setting_user
D:u2f/assets D:u2f/assets
F:7e11e688e39034bbb9d88410044795e1:365:u2f/assets/cert.der F:7e11e688e39034bbb9d88410044795e1:365:u2f/assets/cert.der
F:f60b88c20ed479ed9684e249f7134618:264:u2f/assets/cert_key.u2f F:f60b88c20ed479ed9684e249f7134618:264:u2f/assets/cert_key.u2f