diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index ed5ee6bd7..000000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,169 +0,0 @@ -name: 'Build' - -on: - push: - branches: - - dev - - "release*" - tags: - - '*' - pull_request: - -env: - TARGETS: f7 - DEFAULT_TARGET: f7 - -jobs: - main: - runs-on: [self-hosted,FlipperZeroShell] - steps: - - name: 'Decontaminate previous build leftovers' - run: | - if [ -d .git ]; then - git submodule status || git checkout "$(git rev-list --max-parents=0 HEAD | tail -n 1)" - fi - - - name: 'Checkout code' - uses: actions/checkout@v2 - with: - fetch-depth: 0 - ref: ${{ github.event.pull_request.head.sha }} - - - name: 'Make artifacts directory' - run: | - rm -rf artifacts - mkdir artifacts - - - name: 'Get commit details' - run: | - if [[ ${{ github.event_name }} == 'pull_request' ]]; then - TYPE="pull" - elif [[ "${{ github.ref }}" == "refs/tags/"* ]]; then - TYPE="tag" - else - TYPE="other" - fi - python3 scripts/get_env.py "--event_file=${{ github.event_path }}" "--type=$TYPE" - - - name: 'Generate suffixes for comment' - id: names - run: | - echo "::set-output name=branch_name::${BRANCH_NAME}" - echo "::set-output name=commit_sha::${COMMIT_SHA}" - echo "::set-output name=default_target::${DEFAULT_TARGET}" - echo "::set-output name=suffix::${SUFFIX}" - - - name: 'Bundle scripts' - if: ${{ !github.event.pull_request.head.repo.fork }} - run: | - tar czpf artifacts/flipper-z-any-scripts-${SUFFIX}.tgz scripts debug - - - name: 'Build the firmware' - run: | - set -e - for TARGET in ${TARGETS}; do - FBT_TOOLCHAIN_PATH=/runner/_work ./fbt TARGET_HW="$(echo "${TARGET}" | sed 's/f//')" \ - copro_dist updater_package ${{ startsWith(github.ref, 'refs/tags') && 'DEBUG=0 COMPACT=1' || '' }} - done - - - name: 'Move upload files' - if: ${{ !github.event.pull_request.head.repo.fork }} - run: | - set -e - for TARGET in ${TARGETS}; do - mv dist/${TARGET}-*/* artifacts/ - done - - - name: "Check for uncommitted changes" - run: | - git diff --exit-code - - - name: 'Bundle resources' - if: ${{ !github.event.pull_request.head.repo.fork }} - run: | - tar czpf "artifacts/flipper-z-any-resources-${SUFFIX}.tgz" -C assets resources - - - name: 'Bundle core2 firmware' - if: ${{ !github.event.pull_request.head.repo.fork }} - run: | - cp build/core2_firmware.tgz "artifacts/flipper-z-any-core2_firmware-${SUFFIX}.tgz" - - - name: 'Copy .map file' - run: | - cp build/f7-firmware-*/firmware.elf.map "artifacts/flipper-z-f7-firmware-${SUFFIX}.elf.map" - - - name: 'Upload artifacts to update server' - if: ${{ !github.event.pull_request.head.repo.fork }} - run: | - mkdir -p ~/.ssh - ssh-keyscan -p ${{ secrets.RSYNC_DEPLOY_PORT }} -H ${{ secrets.RSYNC_DEPLOY_HOST }} > ~/.ssh/known_hosts - echo "${{ secrets.RSYNC_DEPLOY_KEY }}" > deploy_key; - chmod 600 ./deploy_key; - rsync -avzP --delete --mkpath \ - -e 'ssh -p ${{ secrets.RSYNC_DEPLOY_PORT }} -i ./deploy_key' \ - artifacts/ ${{ secrets.RSYNC_DEPLOY_USER }}@${{ secrets.RSYNC_DEPLOY_HOST }}:"${{ secrets.RSYNC_DEPLOY_BASE_PATH }}${BRANCH_NAME}/"; - rm ./deploy_key; - - - name: 'Trigger update server reindex' - if: ${{ !github.event.pull_request.head.repo.fork }} - run: curl -X POST -F 'key=${{ secrets.REINDEX_KEY }}' ${{ secrets.REINDEX_URL }} - - - name: 'Find Previous Comment' - if: ${{ !github.event.pull_request.head.repo.fork && github.event.pull_request }} - uses: peter-evans/find-comment@v1 - id: fc - with: - issue-number: ${{ github.event.pull_request.number }} - comment-author: 'github-actions[bot]' - body-includes: 'Compiled firmware for commit' - - - name: 'Create or update comment' - if: ${{ !github.event.pull_request.head.repo.fork && github.event.pull_request}} - uses: peter-evans/create-or-update-comment@v1 - with: - comment-id: ${{ steps.fc.outputs.comment-id }} - issue-number: ${{ github.event.pull_request.number }} - body: | - **Compiled firmware for commit `${{steps.names.outputs.commit_sha}}`:** - - [📦 Update package](https://update.flipperzero.one/builds/firmware/${{steps.names.outputs.branch_name}}/flipper-z-${{steps.names.outputs.default_target}}-update-${{steps.names.outputs.suffix}}.tgz) - - [📥 DFU file](https://update.flipperzero.one/builds/firmware/${{steps.names.outputs.branch_name}}/flipper-z-${{steps.names.outputs.default_target}}-full-${{steps.names.outputs.suffix}}.dfu) - - [☁️ Web/App updater](https://lab.flipper.net/?url=https://update.flipperzero.one/builds/firmware/${{steps.names.outputs.branch_name}}/flipper-z-${{steps.names.outputs.default_target}}-update-${{steps.names.outputs.suffix}}.tgz&channel=${{steps.names.outputs.branch_name}}&version=${{steps.names.outputs.commit_sha}}) - edit-mode: replace - - compact: - if: ${{ !startsWith(github.ref, 'refs/tags') }} - runs-on: [self-hosted,FlipperZeroShell] - steps: - - name: 'Decontaminate previous build leftovers' - run: | - if [ -d .git ] - then - git submodule status \ - || git checkout "$(git rev-list --max-parents=0 HEAD | tail -n 1)" - fi - - - name: 'Checkout code' - uses: actions/checkout@v2 - with: - fetch-depth: 0 - submodules: true - ref: ${{ github.event.pull_request.head.sha }} - - - name: 'Get commit details' - run: | - if [[ ${{ github.event_name }} == 'pull_request' ]]; then - TYPE="pull" - elif [[ "${{ github.ref }}" == "refs/tags/"* ]]; then - TYPE="tag" - else - TYPE="other" - fi - python3 scripts/get_env.py "--event_file=${{ github.event_path }}" "--type=$TYPE" - - - name: 'Build the firmware' - run: | - set -e - for TARGET in ${TARGETS}; do - FBT_TOOLCHAIN_PATH=/runner/_work ./fbt TARGET_HW="$(echo "${TARGET}" | sed 's/f//')" \ - updater_package DEBUG=0 COMPACT=1 - done diff --git a/.github/workflows/pvs_studio.yml b/.github/workflows/pvs_studio.yml deleted file mode 100644 index f28fad20d..000000000 --- a/.github/workflows/pvs_studio.yml +++ /dev/null @@ -1,105 +0,0 @@ -name: 'Static C/C++ analysis with PVS-Studio' - -on: - push: - branches: - - dev - - "release*" - tags: - - '*' - pull_request: - -env: - TARGETS: f7 - DEFAULT_TARGET: f7 - -jobs: - analyse_c_cpp: - if: ${{ !github.event.pull_request.head.repo.fork }} - runs-on: [self-hosted, FlipperZeroShell] - steps: - - name: 'Decontaminate previous build leftovers' - run: | - if [ -d .git ]; then - git submodule status || git checkout "$(git rev-list --max-parents=0 HEAD | tail -n 1)" - fi - - - name: 'Checkout code' - uses: actions/checkout@v2 - with: - fetch-depth: 0 - ref: ${{ github.event.pull_request.head.sha }} - - - name: 'Get commit details' - run: | - if [[ ${{ github.event_name }} == 'pull_request' ]]; then - TYPE="pull" - elif [[ "${{ github.ref }}" == "refs/tags/"* ]]; then - TYPE="tag" - else - TYPE="other" - fi - python3 scripts/get_env.py "--event_file=${{ github.event_path }}" "--type=$TYPE" - - - name: 'Generate suffixes for comment' - if: ${{ !github.event.pull_request.head.repo.fork && github.event.pull_request }} - id: names - run: | - echo "::set-output name=branch_name::${BRANCH_NAME}" - echo "::set-output name=commit_sha::${COMMIT_SHA}" - echo "::set-output name=default_target::${DEFAULT_TARGET}" - echo "::set-output name=suffix::${SUFFIX}" - - - name: 'Make reports directory' - run: | - rm -rf reports/ - mkdir reports - - - name: 'Generate compile_comands.json' - run: | - FBT_TOOLCHAIN_PATH=/runner/_work ./fbt COMPACT=1 version_json proto_ver icons firmware_cdb dolphin_internal dolphin_blocking - - - name: 'Static code analysis' - run: | - FBT_TOOLCHAIN_PATH=/runner/_work source scripts/toolchain/fbtenv.sh - pvs-studio-analyzer credentials ${{ secrets.PVS_STUDIO_CREDENTIALS }} - pvs-studio-analyzer analyze \ - @.pvsoptions \ - -j$(grep -c processor /proc/cpuinfo) \ - -f build/f7-firmware-DC/compile_commands.json \ - -o PVS-Studio.log - - - name: 'Convert PVS-Studio output to html page' - run: plog-converter -a GA:1,2,3 -t fullhtml PVS-Studio.log -o reports/${DEFAULT_TARGET}-${SUFFIX} - - - name: 'Upload artifacts to update server' - if: ${{ !github.event.pull_request.head.repo.fork }} - run: | - mkdir -p ~/.ssh - ssh-keyscan -p ${{ secrets.RSYNC_DEPLOY_PORT }} -H ${{ secrets.RSYNC_DEPLOY_HOST }} > ~/.ssh/known_hosts - echo "${{ secrets.RSYNC_DEPLOY_KEY }}" > deploy_key; - chmod 600 ./deploy_key; - rsync -avrzP --mkpath \ - -e 'ssh -p ${{ secrets.RSYNC_DEPLOY_PORT }} -i ./deploy_key' \ - reports/ ${{ secrets.RSYNC_DEPLOY_USER }}@${{ secrets.RSYNC_DEPLOY_HOST }}:/home/data/firmware-pvs-studio-report/"${BRANCH_NAME}/"; - rm ./deploy_key; - - - name: 'Find Previous Comment' - if: ${{ !github.event.pull_request.head.repo.fork && github.event.pull_request }} - uses: peter-evans/find-comment@v1 - id: fc - with: - issue-number: ${{ github.event.pull_request.number }} - comment-author: 'github-actions[bot]' - body-includes: 'PVS-Studio report for commit' - - - name: 'Create or update comment' - if: ${{ !github.event.pull_request.head.repo.fork && github.event.pull_request}} - uses: peter-evans/create-or-update-comment@v1 - with: - comment-id: ${{ steps.fc.outputs.comment-id }} - issue-number: ${{ github.event.pull_request.number }} - body: | - **PVS-Studio report for commit `${{steps.names.outputs.commit_sha}}`:** - - [Report](https://update.flipperzero.one/builds/firmware-pvs-studio-report/${{steps.names.outputs.branch_name}}/${{steps.names.outputs.default_target}}-${{steps.names.outputs.suffix}}/index.html) - edit-mode: replace diff --git a/assets/resources/dolphin/L1_Halloween_128x64/frame_0.bm b/assets/resources/dolphin/L1_Halloween_128x64/frame_0.bm deleted file mode 100644 index 2d7dbac04..000000000 Binary files a/assets/resources/dolphin/L1_Halloween_128x64/frame_0.bm and /dev/null differ diff --git a/assets/resources/dolphin/L1_Halloween_128x64/frame_1.bm b/assets/resources/dolphin/L1_Halloween_128x64/frame_1.bm deleted file mode 100644 index 495c3cc8a..000000000 Binary files a/assets/resources/dolphin/L1_Halloween_128x64/frame_1.bm and /dev/null differ diff --git a/assets/resources/dolphin/L1_Halloween_128x64/frame_2.bm b/assets/resources/dolphin/L1_Halloween_128x64/frame_2.bm deleted file mode 100644 index 91f2de20e..000000000 Binary files a/assets/resources/dolphin/L1_Halloween_128x64/frame_2.bm and /dev/null differ diff --git a/assets/resources/dolphin/L1_Halloween_128x64/frame_3.bm b/assets/resources/dolphin/L1_Halloween_128x64/frame_3.bm deleted file mode 100644 index 4a914a294..000000000 Binary files a/assets/resources/dolphin/L1_Halloween_128x64/frame_3.bm and /dev/null differ diff --git a/assets/resources/dolphin/L1_Halloween_128x64/meta.txt b/assets/resources/dolphin/L1_Halloween_128x64/meta.txt deleted file mode 100644 index 6ff707d12..000000000 --- a/assets/resources/dolphin/L1_Halloween_128x64/meta.txt +++ /dev/null @@ -1,14 +0,0 @@ -Filetype: Flipper Animation -Version: 1 - -Width: 128 -Height: 64 -Passive frames: 4 -Active frames: 0 -Frames order: 0 1 2 3 -Active cycles: 0 -Frame rate: 3 -Duration: 3600 -Active cooldown: 0 - -Bubble slots: 0 diff --git a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_0.bm b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_0.bm deleted file mode 100644 index 436bc602f..000000000 Binary files a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_0.bm and /dev/null differ diff --git a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_1.bm b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_1.bm deleted file mode 100644 index 33228b8e1..000000000 Binary files a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_1.bm and /dev/null differ diff --git a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_2.bm b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_2.bm deleted file mode 100644 index d21335363..000000000 Binary files a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_2.bm and /dev/null differ diff --git a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_3.bm b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_3.bm deleted file mode 100644 index 8c0430da1..000000000 Binary files a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_3.bm and /dev/null differ diff --git a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_4.bm b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_4.bm deleted file mode 100644 index 78a5862a1..000000000 Binary files a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_4.bm and /dev/null differ diff --git a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_5.bm b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_5.bm deleted file mode 100644 index 7702099d0..000000000 Binary files a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_5.bm and /dev/null differ diff --git a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_6.bm b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_6.bm deleted file mode 100644 index cda2e4d0d..000000000 Binary files a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_6.bm and /dev/null differ diff --git a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_7.bm b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_7.bm deleted file mode 100644 index 8c7910c83..000000000 Binary files a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_7.bm and /dev/null differ diff --git a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_8.bm b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_8.bm deleted file mode 100644 index 9cb483006..000000000 Binary files a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_8.bm and /dev/null differ diff --git a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_9.bm b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_9.bm deleted file mode 100644 index 538c4edb6..000000000 Binary files a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_9.bm and /dev/null differ diff --git a/assets/resources/dolphin/L2_FlipperCity_128x64/meta.txt b/assets/resources/dolphin/L2_FlipperCity_128x64/meta.txt deleted file mode 100644 index fdddbdb2e..000000000 --- a/assets/resources/dolphin/L2_FlipperCity_128x64/meta.txt +++ /dev/null @@ -1,14 +0,0 @@ -Filetype: Flipper Animation -Version: 1 - -Width: 128 -Height: 64 -Passive frames: 10 -Active frames: 0 -Frames order: 0 1 2 3 4 5 6 7 8 9 -Active cycles: 0 -Frame rate: 4 -Duration: 3600 -Active cooldown: 0 - -Bubble slots: 0 diff --git a/assets/resources/dolphin/L3_Fireplace_128x64/frame_0.bm b/assets/resources/dolphin/L3_Fireplace_128x64/frame_0.bm deleted file mode 100644 index 8d94f351e..000000000 Binary files a/assets/resources/dolphin/L3_Fireplace_128x64/frame_0.bm and /dev/null differ diff --git a/assets/resources/dolphin/L3_Fireplace_128x64/frame_1.bm b/assets/resources/dolphin/L3_Fireplace_128x64/frame_1.bm deleted file mode 100644 index dc81be9b0..000000000 Binary files a/assets/resources/dolphin/L3_Fireplace_128x64/frame_1.bm and /dev/null differ diff --git a/assets/resources/dolphin/L3_Fireplace_128x64/frame_2.bm b/assets/resources/dolphin/L3_Fireplace_128x64/frame_2.bm deleted file mode 100644 index ef880108e..000000000 Binary files a/assets/resources/dolphin/L3_Fireplace_128x64/frame_2.bm and /dev/null differ diff --git a/assets/resources/dolphin/L3_Fireplace_128x64/frame_3.bm b/assets/resources/dolphin/L3_Fireplace_128x64/frame_3.bm deleted file mode 100644 index a3bd736a2..000000000 Binary files a/assets/resources/dolphin/L3_Fireplace_128x64/frame_3.bm and /dev/null differ diff --git a/assets/resources/dolphin/L3_Fireplace_128x64/frame_4.bm b/assets/resources/dolphin/L3_Fireplace_128x64/frame_4.bm deleted file mode 100644 index 0eec932d6..000000000 Binary files a/assets/resources/dolphin/L3_Fireplace_128x64/frame_4.bm and /dev/null differ diff --git a/assets/resources/dolphin/L3_Fireplace_128x64/frame_5.bm b/assets/resources/dolphin/L3_Fireplace_128x64/frame_5.bm deleted file mode 100644 index 91c7773b0..000000000 Binary files a/assets/resources/dolphin/L3_Fireplace_128x64/frame_5.bm and /dev/null differ diff --git a/assets/resources/dolphin/L3_Fireplace_128x64/frame_6.bm b/assets/resources/dolphin/L3_Fireplace_128x64/frame_6.bm deleted file mode 100644 index a0429f7e9..000000000 Binary files a/assets/resources/dolphin/L3_Fireplace_128x64/frame_6.bm and /dev/null differ diff --git a/assets/resources/dolphin/L3_Fireplace_128x64/frame_7.bm b/assets/resources/dolphin/L3_Fireplace_128x64/frame_7.bm deleted file mode 100644 index b2ada57a8..000000000 Binary files a/assets/resources/dolphin/L3_Fireplace_128x64/frame_7.bm and /dev/null differ diff --git a/assets/resources/dolphin/L3_Fireplace_128x64/meta.txt b/assets/resources/dolphin/L3_Fireplace_128x64/meta.txt deleted file mode 100644 index 7f4d20a0f..000000000 --- a/assets/resources/dolphin/L3_Fireplace_128x64/meta.txt +++ /dev/null @@ -1,14 +0,0 @@ -Filetype: Flipper Animation -Version: 1 - -Width: 128 -Height: 64 -Passive frames: 8 -Active frames: 0 -Frames order: 0 1 2 3 4 5 6 7 -Active cycles: 0 -Frame rate: 3 -Duration: 3600 -Active cooldown: 0 - -Bubble slots: 0