From 75e4a417a1a1edcc775c98e620b47a8ca0d0f03a Mon Sep 17 00:00:00 2001
From: Dmitry Ermakov <de@dimer.org.ua>
Date: Thu, 12 May 2022 23:32:31 +0300
Subject: [PATCH] Fix github actions

---
 .../workflows/hi3516ev300_ultimate_images.yml | 49 +++++++++----------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/hi3516ev300_ultimate_images.yml b/.github/workflows/hi3516ev300_ultimate_images.yml
index 2f19f420..fa6ccba5 100644
--- a/.github/workflows/hi3516ev300_ultimate_images.yml
+++ b/.github/workflows/hi3516ev300_ultimate_images.yml
@@ -1,4 +1,4 @@
-name: "Hi3516Ev300 (ultimate)  "
+name: "Hi3516Ev300 (ultimate)"
 
 on:
   push:
@@ -56,6 +56,7 @@ jobs:
           echo "RELEASE_NAME=$RELEASE_NAME" >> $GITHUB_ENV
           echo "PRERELEASE=$PRERELEASE" >> $GITHUB_ENV
           echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
+          echo "BOARD=hi3516ev300" >> $GITHUB_ENV
           cd $GITHUB_WORKSPACE
           make prepare
 
@@ -63,36 +64,34 @@ jobs:
         id: build-hi3516ev300-ultimate-firmware
         continue-on-error: true
         run: |
-          ARCHIVE_FW="${GITHUB_WORKSPACE}/output/images/openipc.hi3516ev300-ultimate-br.tgz"
+          ARCHIVE_FW="${GITHUB_WORKSPACE}/output/images/openipc.${BOARD}-ultimate-br.tgz"
+          ARCHIVE_FW_NAND="${GITHUB_WORKSPACE}/output/images/openipc.${BOARD}-nand-br.tgz"
           echo "ARCHIVE_FW=$ARCHIVE_FW" >> $GITHUB_ENV
+          echo "ARCHIVE_FW_NAND=$ARCHIVE_FW_NAND" >> $GITHUB_ENV
           cd $GITHUB_WORKSPACE
-          make PLATFORM=hisilicon BOARD=unknown_unknown_hi3516ev300_ultimate all
-          [[ $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/uImage) -gt 2097152 ]] && echo "TG_NOTIFY=Warning, kernel size exceeded : $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/uImage) vs 2097152... HI3516EV300 (ultimate)" >> $GITHUB_ENV && exit 1
-          [[ $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/rootfs.squashfs) -gt 13107200 ]] && echo "TG_NOTIFY=Warning, rootfs size exceeded - $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/rootfs.squashfs) vs 13107200... HI3516EV300 (ultimate)" >> $GITHUB_ENV && exit 1
+          make PLATFORM=hisilicon BOARD=unknown_unknown_${BOARD}_ultimate all
+          [[ $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/uImage) -gt 3145728 ]] && echo "TG_NOTIFY=Warning, kernel size exceeded : $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/uImage) ... ${BOARD} (ultimate)" >> $GITHUB_ENV && exit 1
+          [[ $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/rootfs.squashfs) -gt 10485760 ]] && echo "TG_NOTIFY=Warning, rootfs size exceeded - $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/rootfs.squashfs) vs 10485760... ${BOARD} (ultimate)" >> $GITHUB_ENV && exit 1
           cd ${GITHUB_WORKSPACE}/output/images
-          mv uImage uImage.hi3516ev300-ultimate
-          mv rootfs.squashfs rootfs.squashfs.hi3516ev300-ultimate
-          md5sum rootfs.squashfs.hi3516ev300-ultimate > rootfs.squashfs.hi3516ev300-ultimate.md5sum
-          md5sum uImage.hi3516ev300-ultimate > uImage.hi3516ev300-ultimate.md5sum
-          tar -cvzf $ARCHIVE_FW *hi3516ev300-ultimate*
-
-      - name: Build Hi3516Ev300 (ultimate) SDK
-        id: build-hi3516ev300-ultimate-sdk
-        continue-on-error: true
-        run: |
-          ARCHIVE_SDK="${GITHUB_WORKSPACE}/output/images/arm-openipc-linux-musleabi_sdk-buildroot.tar.gz"
-          echo "ARCHIVE_SDK=$ARCHIVE_SDK" >> $GITHUB_ENV
-          cd $GITHUB_WORKSPACE/output
-          make sdk
+          mv uImage uImage.${BOARD}
+          mv rootfs.squashfs rootfs.squashfs.${BOARD}
+          mv rootfs.ubi rootfs.ubi.${BOARD}
+          mv rootfs.ubifs rootfs.ubifs.${BOARD}
+          md5sum rootfs.squashfs.${BOARD} > rootfs.squashfs.${BOARD}.md5sum
+          md5sum uImage.${BOARD} > uImage.${BOARD}.md5sum
+          md5sum rootfs.ubifs.${BOARD} > rootfs.ubifs.${BOARD}.md5sum
+          md5sum uImage.${BOARD} > uImage.${BOARD}.md5sum
+          tar -cvzf $ARCHIVE_FW uImage* *rootfs.squashfs.${BOARD}*
+          tar -cvzf $ARCHIVE_FW_NAND uImage* *rootfs.ubi*.${BOARD}*
 
       - name: Send warning message to telegram channel
         env:
           TG_TOKEN: ${{ secrets.TELEGRAM_TOKEN_BOT_OPENIPC }}
           TG_CHANNEL: ${{ secrets.TELEGRAM_CHANNEL_OPENIPC_DEV }}
-        if: steps.build-hi3516ev300-ultimate-firmware.outcome != 'success' || steps.build-hi3516ev300-ultimate-sdk.outcome != 'success'
+        if: steps.build-hi3516ev300-ultimate-firmware.outcome != 'success'
         run: |
           TG_OPTIONS="-s --connect-timeout 30 --max-time 30"
-          TG_NOTIFY="${TG_NOTIFY:=Warning, Buildroot compiling error... HI3516EV300 (ultimate)}"
+          TG_NOTIFY="${TG_NOTIFY:=Warning, Buildroot compiling error... ${BOARD} (ultimate)}"
           TG_HEADER=$(echo -e "\r\n$TG_NOTIFY \r\n\r\nCommit: $GIT_HASH \r\nBranch: $BRANCH_NAME \r\nTag: $TAG_NAME \r\n\r\n\xE2\x9A\xA0 GitHub Actions")
           curl $TG_OPTIONS -H "Content-Type: multipart/form-data" -X POST https://api.telegram.org/bot$TG_TOKEN/sendMessage \
             -F chat_id=$TG_CHANNEL -F text="$TG_HEADER"
@@ -114,17 +113,17 @@ jobs:
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ env.ARCHIVE_FW }}
-          asset_name: "openipc.hi3516ev300-ultimate-br.tgz"
+          asset_name: openipc.${{ env.BOARD }}-ultimate-br.tgz
           tag: ${{ env.TAG_NAME }}
           overwrite: true
 
-      - name: Upload SDK to release
+      - name: Upload FW to release
         uses: svenstaro/upload-release-action@v2
         continue-on-error: true
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ env.ARCHIVE_SDK }}
-          asset_name: "arm-openipc-hi3516ev300-ultimate-linux-musleabi_sdk-buildroot.tar.gz"
+          file: ${{ env.ARCHIVE_FW_NAND }}
+          asset_name: openipc.${{ env.BOARD }}-nand-br.tgz
           tag: ${{ env.TAG_NAME }}
           overwrite: true