Refactoring firmware uploading to update server (#238)

* Replace f2 to f3
This commit is contained in:
rusdacent 2020-11-15 13:14:52 +03:00 committed by GitHub
parent 714d732745
commit 466ea087a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 20 deletions

BIN
.github/assets/Born2bSportyV2.ttf vendored Normal file

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

View file

@ -110,12 +110,12 @@ jobs:
- name: Get bootloader - name: Get bootloader
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: bootloader_f2 name: bootloader_f3
path: bootloader path: bootloader
- name: Get firmware - name: Get firmware
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: firmware_f2 name: firmware_f3
path: firmware path: firmware
- name: Upload bootloader - name: Upload bootloader
uses: burnett01/rsync-deployments@4.1 uses: burnett01/rsync-deployments@4.1
@ -145,17 +145,12 @@ jobs:
- name: Get bootloader - name: Get bootloader
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: bootloader_f2 name: bootloader_f3
path: bootloader path: bootloader
- name: Get firmware - name: Get firmware
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: firmware_f2 name: firmware_f3
path: firmware
- name: Get firmware
uses: actions/download-artifact@v2
with:
name: firmware_f2
path: firmware path: firmware
- name: cp - name: cp
run: cp ./bootloader/bootloader.bin full_firmware_latest.bin run: cp ./bootloader/bootloader.bin full_firmware_latest.bin
@ -187,12 +182,6 @@ jobs:
fetch-depth: 0 fetch-depth: 0
ref: master ref: master
submodules: true submodules: true
- name: Echo debug
run: echo ${{ github.ref }}
- name: Get template and font
run: |
wget https://zhovner.com/tmp/latest-firmware-template.png
wget https://zhovner.com/tmp/Born2bSportyV2.ttf
- name: Set test env - name: Set test env
run: echo "NUMBER_OF_COMMITS=$(git rev-list --count HEAD)" >> $GITHUB_ENV run: echo "NUMBER_OF_COMMITS=$(git rev-list --count HEAD)" >> $GITHUB_ENV
- name: Test output NUMBER_OF_COMMITS - name: Test output NUMBER_OF_COMMITS
@ -205,12 +194,12 @@ jobs:
- name: Test output PREP_DATE - name: Test output PREP_DATE
run: echo $PREP_DATE run: echo $PREP_DATE
- name: Gen pic - name: Gen pic
run: convert latest-firmware-template.png -font ./Born2bSportyV2.ttf -weight 700 -pointsize 140 -annotate +900+330 "$NUMBER_OF_COMMITS $PREP_DATE" out.png run: convert ./.github/assets/latest-firmware-template.png -font ./.github/assets/Born2bSportyV2.ttf -weight 700 -pointsize 140 -annotate +900+330 "$NUMBER_OF_COMMITS $PREP_DATE" latest-firmware-banner.png
- name: Upload pic - name: Upload pic
uses: burnett01/rsync-deployments@4.1 uses: burnett01/rsync-deployments@4.1
with: with:
switches: -avzp --delete switches: -avzp --delete
path: out.png path: latest-firmware-banner.png
remote_path: "${{ secrets.RSYNC_DEPLOY_BASE_PATH }}/" remote_path: "${{ secrets.RSYNC_DEPLOY_BASE_PATH }}/"
remote_host: ${{ secrets.RSYNC_DEPLOY_HOST }} remote_host: ${{ secrets.RSYNC_DEPLOY_HOST }}
remote_user: ${{ secrets.RSYNC_DEPLOY_USER }} remote_user: ${{ secrets.RSYNC_DEPLOY_USER }}

View file

@ -8,7 +8,7 @@ Welcome to [Flipper Zero](https://flipperzero.one/)'s Firmware repo! Our goal is
# Update firmware # Update firmware
<a href="https://update.flipperzero.one/full_firmware_latest.bin"><img width="300" src="https://update.flipperzero.one/latest-firmware-banner.gif" /></a> <a href="https://update.flipperzero.one/full_firmware_latest.bin"><img width="300" src="https://update.flipperzero.one/latest-firmware-banner.png" /></a>
Flipper Zero's firmware consists of two components: Bootloader and main firmware. Bootloader controls firmware update process over USB. You need working bootloader installed before update firmware over USB. Flipper Zero's firmware consists of two components: Bootloader and main firmware. Bootloader controls firmware update process over USB. You need working bootloader installed before update firmware over USB.