From 234e4db12fc4b240168703398dda98ad720e309a Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Fri, 26 Aug 2022 11:50:34 +0300 Subject: [PATCH] Use same env variables for control image sizes --- .github/workflows/matrix_build.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/matrix_build.yml b/.github/workflows/matrix_build.yml index 767f6f01..1d0a05c4 100644 --- a/.github/workflows/matrix_build.yml +++ b/.github/workflows/matrix_build.yml @@ -18,8 +18,10 @@ on: workflow_dispatch: env: - MAX_UIMAGE_LITE: 0x300000 - MAX_ROOTFS_LITE: 0xa00000 + MAX_KERNEL_SIZE: 0x200000 + MAX_ROOTFS_SIZE: 0x500000 + MAX_KERNEL_SIZE_ULTIMATE: 0x300000 + MAX_ROOTFS_SIZE_ULTIMATE: 0xa00000 jobs: toolchain: @@ -454,9 +456,16 @@ jobs: } if [ -f rootfs.squashfs ]; then - # TODO: check why it doesn't fail on fpv rootfs? - check_exceeded uImage ${MAX_UIMAGE_LITE} - check_exceeded rootfs.squashfs ${MAX_ROOTFS_LITE} + case ${{ matrix.release }} in + lite) + check_exceeded uImage ${MAX_KERNEL_SIZE} + check_exceeded rootfs.squashfs ${MAX_ROOTFS_SIZE} + ;; + ultimate|fpv) + check_exceeded uImage ${MAX_KERNEL_SIZE_ULTIMATE} + check_exceeded rootfs.squashfs ${MAX_ROOTFS_SIZE_ULTIMATE} + ;; + esac NORFW_PATH="${IMAGES_DIR}/openipc.${{ matrix.platform }}-${SUFF}br.tgz" echo "NORFW_PATH=$NORFW_PATH" >> $GITHUB_ENV