From db8766bb7ba1e4eca45878dbda0ed57429c0cd12 Mon Sep 17 00:00:00 2001 From: cronyx Date: Sun, 15 May 2022 21:46:48 +0300 Subject: [PATCH] fix actions --- .github/workflows/gk7205v200_fpv_images.yml | 1 + .github/workflows/gk7205v300_fpv_images.yml | 1 + .github/workflows/gk7205v300_ultimate_images.yml | 1 + scripts/executing_commands_for_glibc.sh | 4 +++- scripts/executing_commands_for_musl.sh | 4 +++- scripts/executing_commands_for_uclibc.sh | 4 +++- 6 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gk7205v200_fpv_images.yml b/.github/workflows/gk7205v200_fpv_images.yml index 364c8d1c..3ebcc1ed 100644 --- a/.github/workflows/gk7205v200_fpv_images.yml +++ b/.github/workflows/gk7205v200_fpv_images.yml @@ -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=gk7205v200" >> $GITHUB_ENV cd $GITHUB_WORKSPACE make prepare diff --git a/.github/workflows/gk7205v300_fpv_images.yml b/.github/workflows/gk7205v300_fpv_images.yml index f3513d6a..8494866f 100644 --- a/.github/workflows/gk7205v300_fpv_images.yml +++ b/.github/workflows/gk7205v300_fpv_images.yml @@ -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=gk7205v300" >> $GITHUB_ENV cd $GITHUB_WORKSPACE make prepare diff --git a/.github/workflows/gk7205v300_ultimate_images.yml b/.github/workflows/gk7205v300_ultimate_images.yml index 14b53b20..f7a11164 100644 --- a/.github/workflows/gk7205v300_ultimate_images.yml +++ b/.github/workflows/gk7205v300_ultimate_images.yml @@ -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=gk7205v300" >> $GITHUB_ENV cd $GITHUB_WORKSPACE make prepare diff --git a/scripts/executing_commands_for_glibc.sh b/scripts/executing_commands_for_glibc.sh index f9b7e81b..0ae2c4fe 100755 --- a/scripts/executing_commands_for_glibc.sh +++ b/scripts/executing_commands_for_glibc.sh @@ -5,7 +5,9 @@ date "+OPENIPC_VERSION=2.2.%m.%d" >>${TARGET_DIR}/usr/lib/os-release date "+GITHUB_VERSION=\"${BRANCH_NAME}+${GIT_HASH}, %Y-%m-%d\"" >>${TARGET_DIR}/usr/lib/os-release -if grep -q ultimate_defconfig ${BR2_CONFIG}; then +if grep -q fpv_defconfig ${BR2_CONFIG}; then + echo "BUILD_OPTION=fpv" >>${TARGET_DIR}/usr/lib/os-release +elif grep -q ultimate_defconfig ${BR2_CONFIG}; then echo "BUILD_OPTION=ultimate" >>${TARGET_DIR}/usr/lib/os-release else echo "BUILD_OPTION=lite" >>${TARGET_DIR}/usr/lib/os-release diff --git a/scripts/executing_commands_for_musl.sh b/scripts/executing_commands_for_musl.sh index 7827655a..f82bc7a0 100755 --- a/scripts/executing_commands_for_musl.sh +++ b/scripts/executing_commands_for_musl.sh @@ -5,7 +5,9 @@ date "+OPENIPC_VERSION=2.2.%m.%d" >>${TARGET_DIR}/usr/lib/os-release date "+GITHUB_VERSION=\"${BRANCH_NAME}+${GIT_HASH}, %Y-%m-%d\"" >>${TARGET_DIR}/usr/lib/os-release -if grep -q ultimate_defconfig ${BR2_CONFIG}; then +if grep -q fpv_defconfig ${BR2_CONFIG}; then + echo "BUILD_OPTION=fpv" >>${TARGET_DIR}/usr/lib/os-release +elif grep -q ultimate_defconfig ${BR2_CONFIG}; then echo "BUILD_OPTION=ultimate" >>${TARGET_DIR}/usr/lib/os-release else echo "BUILD_OPTION=lite" >>${TARGET_DIR}/usr/lib/os-release diff --git a/scripts/executing_commands_for_uclibc.sh b/scripts/executing_commands_for_uclibc.sh index 2eff5bd0..3651e9ff 100755 --- a/scripts/executing_commands_for_uclibc.sh +++ b/scripts/executing_commands_for_uclibc.sh @@ -5,7 +5,9 @@ date "+OPENIPC_VERSION=2.2.%m.%d" >>${TARGET_DIR}/usr/lib/os-release date "+GITHUB_VERSION=\"${BRANCH_NAME}+${GIT_HASH}, %Y-%m-%d\"" >>${TARGET_DIR}/usr/lib/os-release -if grep -q ultimate_defconfig ${BR2_CONFIG}; then +if grep -q fpv_defconfig ${BR2_CONFIG}; then + echo "BUILD_OPTION=fpv" >>${TARGET_DIR}/usr/lib/os-release +elif grep -q ultimate_defconfig ${BR2_CONFIG}; then echo "BUILD_OPTION=ultimate" >>${TARGET_DIR}/usr/lib/os-release else echo "BUILD_OPTION=lite" >>${TARGET_DIR}/usr/lib/os-release