From c0e05d10be68ef61b59bf4fdc33ff3c0625b1df2 Mon Sep 17 00:00:00 2001 From: Apaczer <94932128+Apaczer@users.noreply.github.com> Date: Fri, 12 Jan 2024 20:55:53 +0100 Subject: [PATCH] [GENIMAGE/ACTIONS] revert ver. to 2.0.0-BETAv2 + append auto-builds with "Dev_build" string --- .github/workflows/build.yml | 4 ++-- board/miyoo/scripts/genimage.sh | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 72c2f42c..85ae5824 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,7 +51,7 @@ jobs: make miyoo_uclibc_defconfig set -o pipefail if ! ( \ - make sdk CFW_HASH="${{ steps.cfwsha.outputs.cfwsha }}" 2>&1 \ + make sdk CFW_HASH="${{ steps.cfwsha.outputs.cfwsha }}" APPEND_VERSION="-Dev_build" 2>&1 \ | tee build.log \ | grep ">>>" \ ); then tail -n100 build.log && exit 1 @@ -135,7 +135,7 @@ jobs: make miyoo_musl_defconfig set -o pipefail if ! ( \ - make sdk CFW_HASH="${{ steps.cfwsha.outputs.cfwsha }}" 2>&1 \ + make sdk CFW_HASH="${{ steps.cfwsha.outputs.cfwsha }}" APPEND_VERSION="-Dev_build" 2>&1 \ | tee build.log \ | grep ">>>" \ ); then tail -n100 build.log && exit 1 diff --git a/board/miyoo/scripts/genimage.sh b/board/miyoo/scripts/genimage.sh index dfed0c5e..e951cbb7 100755 --- a/board/miyoo/scripts/genimage.sh +++ b/board/miyoo/scripts/genimage.sh @@ -1,11 +1,11 @@ #!/bin/bash set -e -CFW_RELEASE="2.0.1" -STATUS="BETA" +CFW_RELEASE="2.0.0" +STATUS="BETAv2" BR2_VENDOR=${2} BR2_VERSION_FULL=${3} LIBC=${4} -export IMAGE_NAME="${BR2_VENDOR}-cfw-${CFW_RELEASE}${BR2_VERSION_FULL}_${LIBC}-${STATUS}.img" +export IMAGE_NAME="${BR2_VENDOR}-cfw-${CFW_RELEASE}${BR2_VERSION_FULL}_${LIBC}-${STATUS}${APPEND_VERSION}.img" STARTDIR=`pwd` SELFDIR=`dirname \`realpath ${0}\`` @@ -46,7 +46,7 @@ else fi # Write CFW version to splash image -convert board/miyoo/miyoo-splash.png -pointsize 12 -fill white -annotate +10+230 "v${CFW_RELEASE} ${CFW_VERSION} (${LIBC}) ${STATUS}" -type Palette -colors 224 -depth 8 -compress none -verbose BMP3:"${BINARIES_DIR}"/boot/miyoo-splash.bmp +convert board/miyoo/miyoo-splash.png -pointsize 12 -fill white -annotate +10+230 "v${CFW_RELEASE} ${CFW_VERSION} (${LIBC}) ${STATUS}${APPEND_VERSION}" -type Palette -colors 224 -depth 8 -compress none -verbose BMP3:"${BINARIES_DIR}"/boot/miyoo-splash.bmp # Generate MAIN BTRFS partition image="${BINARIES_DIR}/main.img"