From d37ad942bc9b215a1a53fd7c7ce9af40124747e8 Mon Sep 17 00:00:00 2001 From: Jackeagle Date: Wed, 13 Nov 2024 19:12:20 +0530 Subject: [PATCH] docker: Add support for a14 branch naming Signed-off-by: Jackeagle --- build-community.sh | 3 +++ src/build.sh | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build-community.sh b/build-community.sh index e1b5023..6060ace 100755 --- a/build-community.sh +++ b/build-community.sh @@ -117,6 +117,9 @@ for branch in ${BRANCH_NAME//,/ }; do elif [[ "${BRANCH_NAME}" =~ $regex_part1"u"$regex_part2 ]]; then themuppets_branch="lineage-21.0" android_version="14" + elif [[ "${BRANCH_NAME}" =~ $regex_part1"a14"$regex_part2 || "${BRANCH_NAME}" =~ "a14" ]]; then + themuppets_branch="lineage-21.0" + android_version="14" else echo ">> [$(date)] Building branch $branch is not (yet) suppported" exit 1 diff --git a/src/build.sh b/src/build.sh index 18409cb..04d5387 100755 --- a/src/build.sh +++ b/src/build.sh @@ -91,7 +91,7 @@ exit_script() { sync_successful=true use_openjdk_from_ubuntu=false -branch_dir=$(sed -E 's/^v[0-9](\.[0-9]*){0,2}(-(beta|alpha|rc)(\.[0-9]*){0,1}){0,1}-(nougat|oreo|pie|q|r|s|t|u)(-[a-zA-Z0-9_]*)*$/\5/' <<<"${BRANCH_NAME}") +branch_dir=$(sed -E 's/^v[0-9](\.[0-9]*){0,2}(-(beta|alpha|rc)(\.[0-9]*){0,1}){0,1}-(nougat|oreo|pie|q|r|s|t|u|a14)(-[a-zA-Z0-9_]*)*$/\5/' <<<"${BRANCH_NAME}") branch_dir=${branch_dir^^} if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then @@ -125,9 +125,12 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then elif [[ "${BRANCH_NAME}" =~ $regex_part1"u"$regex_part2 ]]; then themuppets_branch="lineage-21.0" android_version="14" + elif [[ "${BRANCH_NAME}" =~ $regex_part1"a14"$regex_part2 || "${BRANCH_NAME}" =~ "a14" ]]; then + themuppets_branch="lineage-21.0" + android_version="14" else - echo ">> [$(date)] Building branch $branch is not (yet) suppported" - exit 1 + echo ">> [$(date)] Building branch $BRANCH_NAME is not (yet) supported" + exit 1 fi if [[ "${KEEP_LOCAL_MANIFEST_BRANCH}" = true ]]; then -- GitLab