Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d37ad942 authored by Jackeagle's avatar Jackeagle
Browse files

docker: Add support for a14 branch naming 



Signed-off-by: default avatarJackeagle <jackeagle102@gmail.com>
parent 3daece78

build-community.sh

+3 −0
Original line number Original line Diff line number Diff line
@@ -117,6 +117,9 @@ for branch in ${BRANCH_NAME//,/ }; do 
    elif [[ "${BRANCH_NAME}" =~ $regex_part1"u"$regex_part2 ]]; then

    elif [[ "${BRANCH_NAME}" =~ $regex_part1"u"$regex_part2 ]]; then

      themuppets_branch="lineage-21.0"

      themuppets_branch="lineage-21.0"

      android_version="14"

      android_version="14"

    elif [[ "${BRANCH_NAME}" =~ $regex_part1"a14"$regex_part2 || "${BRANCH_NAME}" =~ "a14" ]]; then

      themuppets_branch="lineage-21.0"

      android_version="14"

    else

    else

      echo ">> [$(date)] Building branch $branch is not (yet) suppported"

      echo ">> [$(date)] Building branch $branch is not (yet) suppported"

      exit 1

      exit 1

src/build.sh

+6 −3
Original line number Original line Diff line number Diff line
@@ -91,7 +91,7 @@ exit_script() { 
sync_successful=true

sync_successful=true





use_openjdk_from_ubuntu=false

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^^}

branch_dir=${branch_dir^^}





if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then

if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
@@ -125,8 +125,11 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then 
  elif [[ "${BRANCH_NAME}" =~ $regex_part1"u"$regex_part2 ]]; then

  elif [[ "${BRANCH_NAME}" =~ $regex_part1"u"$regex_part2 ]]; then

    themuppets_branch="lineage-21.0"

    themuppets_branch="lineage-21.0"

    android_version="14"

    android_version="14"

  elif [[ "${BRANCH_NAME}" =~ $regex_part1"a14"$regex_part2 || "${BRANCH_NAME}" =~ "a14" ]]; then

      themuppets_branch="lineage-21.0"

      android_version="14"

  else

  else

    echo ">> [$(date)] Building branch $branch is not (yet) suppported"

      echo ">> [$(date)] Building branch $BRANCH_NAME is not (yet) supported"

      exit 1

      exit 1

  fi

  fi