mirror of https://github.com/OpenIPC/firmware.git
Remove hardcode for NAND firmware releases
parent
c2f3d780b9
commit
7b665295f1
|
@ -25,7 +25,7 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
env:
|
env:
|
||||||
CHIP: hi3516ev200
|
FAMILY: hi3516ev200
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
sdk-file: ${{ steps.build-sdk.outputs.sdk-file }}
|
sdk-file: ${{ steps.build-sdk.outputs.sdk-file }}
|
||||||
|
@ -57,9 +57,8 @@ jobs:
|
||||||
- name: Build Buildroot SDK
|
- name: Build Buildroot SDK
|
||||||
id: build-sdk
|
id: build-sdk
|
||||||
run: |
|
run: |
|
||||||
set -x
|
|
||||||
make prepare
|
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")
|
SDK_PATH=$(find output/images -name "*_sdk-buildroot.tar.gz")
|
||||||
echo "SDK_PATH=$SDK_PATH" >> $GITHUB_ENV
|
echo "SDK_PATH=$SDK_PATH" >> $GITHUB_ENV
|
||||||
SDK_FILE=$(basename $SDK_PATH)
|
SDK_FILE=$(basename $SDK_PATH)
|
||||||
|
@ -97,9 +96,6 @@ jobs:
|
||||||
- platform: hi3516dv200
|
- platform: hi3516dv200
|
||||||
release: ultimate
|
release: ultimate
|
||||||
|
|
||||||
env:
|
|
||||||
HAS_NAND: ${{ matrix.release == 'ultimate' }} && (${{ matrix.platform == 'hi3516ev300' }} || ${{ matrix.platform == 'hi3516ev200' }})
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
|
@ -194,8 +190,9 @@ jobs:
|
||||||
md5sum uImage.${{ matrix.platform }} > uImage.${{ matrix.platform }}.md5sum
|
md5sum uImage.${{ matrix.platform }} > uImage.${{ matrix.platform }}.md5sum
|
||||||
tar -cvzf $NORFW_PATH uImage* *rootfs.squashfs.${{ matrix.platform }}*
|
tar -cvzf $NORFW_PATH uImage* *rootfs.squashfs.${{ matrix.platform }}*
|
||||||
|
|
||||||
# TODO: infer from configs
|
HAS_NAND=$(make BOARD=${BOARD} has-nand)
|
||||||
if [ "$HAS_NAND" == "true" ]; then
|
echo "HAS_NAND=$HAS_NAND" >> $GITHUB_ENV
|
||||||
|
if [ "$HAS_NAND" == "y" ]; then
|
||||||
NANDFW_PATH="${GITHUB_WORKSPACE}/output/images/openipc.${{ matrix.platform }}-nand-br.tgz"
|
NANDFW_PATH="${GITHUB_WORKSPACE}/output/images/openipc.${{ matrix.platform }}-nand-br.tgz"
|
||||||
echo "NANDFW_PATH=$NANDFW_PATH" >> $GITHUB_ENV
|
echo "NANDFW_PATH=$NANDFW_PATH" >> $GITHUB_ENV
|
||||||
NANDFW_FILE=$(basename $NANDFW_PATH)
|
NANDFW_FILE=$(basename $NANDFW_PATH)
|
||||||
|
@ -244,7 +241,7 @@ jobs:
|
||||||
overwrite: true
|
overwrite: true
|
||||||
|
|
||||||
- name: Upload NAND FW to release
|
- 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
|
uses: svenstaro/upload-release-action@v2
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
with:
|
with:
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -67,6 +67,8 @@ install-deps:
|
||||||
$(eval CHIP := $(shell echo $@ | cut -d "_" -f 3))
|
$(eval CHIP := $(shell echo $@ | cut -d "_" -f 3))
|
||||||
@cat $(BR_EXT_DIR)/board/$(FAMILY)/$(CHIP).config
|
@cat $(BR_EXT_DIR)/board/$(FAMILY)/$(CHIP).config
|
||||||
|
|
||||||
|
has-nand:
|
||||||
|
@sed -rn "s/^BR2_TARGET_ROOTFS_UBI=(y)/\1/p" $(FULL_PATH)
|
||||||
|
|
||||||
list-configs:
|
list-configs:
|
||||||
@echo
|
@echo
|
||||||
|
|
Loading…
Reference in New Issue