Remove hardcode for NAND firmware releases

pull/356/head
Dmitry Ilyin 2022-08-14 21:48:15 +03:00
parent c2f3d780b9
commit 7b665295f1
2 changed files with 8 additions and 9 deletions

View File

@ -25,7 +25,7 @@ jobs:
runs-on: ubuntu-latest
env:
CHIP: hi3516ev200
FAMILY: hi3516ev200
outputs:
sdk-file: ${{ steps.build-sdk.outputs.sdk-file }}
@ -57,9 +57,8 @@ jobs:
- name: Build Buildroot SDK
id: build-sdk
run: |
set -x
make prepare
make BOARD=unknown_unknown_${CHIP}_openipc br-sdk
make BOARD=unknown_unknown_${FAMILY}_openipc br-sdk
SDK_PATH=$(find output/images -name "*_sdk-buildroot.tar.gz")
echo "SDK_PATH=$SDK_PATH" >> $GITHUB_ENV
SDK_FILE=$(basename $SDK_PATH)
@ -97,9 +96,6 @@ jobs:
- platform: hi3516dv200
release: ultimate
env:
HAS_NAND: ${{ matrix.release == 'ultimate' }} && (${{ matrix.platform == 'hi3516ev300' }} || ${{ matrix.platform == 'hi3516ev200' }})
steps:
- name: Checkout
@ -194,8 +190,9 @@ jobs:
md5sum uImage.${{ matrix.platform }} > uImage.${{ matrix.platform }}.md5sum
tar -cvzf $NORFW_PATH uImage* *rootfs.squashfs.${{ matrix.platform }}*
# TODO: infer from configs
if [ "$HAS_NAND" == "true" ]; then
HAS_NAND=$(make BOARD=${BOARD} has-nand)
echo "HAS_NAND=$HAS_NAND" >> $GITHUB_ENV
if [ "$HAS_NAND" == "y" ]; then
NANDFW_PATH="${GITHUB_WORKSPACE}/output/images/openipc.${{ matrix.platform }}-nand-br.tgz"
echo "NANDFW_PATH=$NANDFW_PATH" >> $GITHUB_ENV
NANDFW_FILE=$(basename $NANDFW_PATH)
@ -244,7 +241,7 @@ jobs:
overwrite: true
- name: Upload NAND FW to release
if: ${{ !env.ACT && github.event_name != 'pull_request' && env.HAS_NAND }}
if: ${{ !env.ACT && github.event_name != 'pull_request' && env.HAS_NAND == 'y' }}
uses: svenstaro/upload-release-action@v2
continue-on-error: true
with:

View File

@ -67,6 +67,8 @@ install-deps:
$(eval CHIP := $(shell echo $@ | cut -d "_" -f 3))
@cat $(BR_EXT_DIR)/board/$(FAMILY)/$(CHIP).config
has-nand:
@sed -rn "s/^BR2_TARGET_ROOTFS_UBI=(y)/\1/p" $(FULL_PATH)
list-configs:
@echo