Просмотр исходного кода

Refactoring firmware uploading to update server (#238)

* Replace f2 to f3
rusdacent 5 лет назад
Родитель
Сommit
466ea087a0
4 измененных файлов с 9 добавлено и 20 удалено
  1. BIN
      .github/assets/Born2bSportyV2.ttf
  2. BIN
      .github/assets/latest-firmware-template.png
  3. 8 19
      .github/workflows/ci.yml
  4. 1 1
      README.md

BIN
.github/assets/Born2bSportyV2.ttf


BIN
.github/assets/latest-firmware-template.png


+ 8 - 19
.github/workflows/ci.yml

@@ -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,18 +145,13 @@ 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
-          path: firmware
-      - name: Get firmware
-        uses: actions/download-artifact@v2
-        with:
-          name: firmware_f2
-          path: firmware     
+          name: firmware_f3
+          path: firmware 
       - name: cp 
       - name: cp 
         run: cp ./bootloader/bootloader.bin full_firmware_latest.bin
         run: cp ./bootloader/bootloader.bin full_firmware_latest.bin
       - name: truncate 
       - name: truncate 
@@ -185,14 +180,8 @@ jobs:
         uses: actions/checkout@v2
         uses: actions/checkout@v2
         with:
         with:
           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 }}

+ 1 - 1
README.md

@@ -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.