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

Commit d7089ace authored by Alexandre Roux's avatar Alexandre Roux
Browse files

Merge branch '000-master-custom_branch_fix' into 'master' 

docker: Make branch match more explicit

See merge request !71
parents d801bda5 336c144b

build-community.sh

+7 −7
Original line number Diff line number Diff line
@@ -84,32 +84,32 @@ for branch in ${BRANCH_NAME//,/ }; do 
  if [ -n "$branch" ] && [ -n "$devices" ]; then

    vendor=lineage

    case "$branch" in

      *nougat*)

      v*-nougat*)

        vendor="cm"

        themuppets_branch="cm-14.1"

        android_version="7.1.2"

        ;;

      *oreo*)

      v*-oreo*)

        themuppets_branch="lineage-15.1"

        android_version="8.1"

        ;;

      *pie*)

      v*-pie*)

        themuppets_branch="lineage-16.0"

        android_version="9"

        ;;

      *q*)

      v*-q*)

        themuppets_branch="lineage-17.1"

        android_version="10"

        ;;

      *r*)

      v*-r*)

        themuppets_branch="lineage-18.1"

        android_version="11"

        ;;

      *s*)

      v*-s*)

        themuppets_branch="lineage-19.1"

        android_version="12"

        ;;

      *t*)

      v*-t*)

        themuppets_branch="lineage-20.0"

        android_version="13"

        ;;

src/build.sh

+7 −7
Original line number Diff line number Diff line
@@ -40,34 +40,34 @@ branch_dir=${branch_dir^^} 
if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then

  vendor=lineage

  case "$BRANCH_NAME" in

    *nougat*)

    v*-nougat*)

      vendor="cm"

      themuppets_branch="cm-14.1"

      android_version="7.1.2"

      use_openjdk_from_ubuntu=true

      ;;

    *oreo*)

    v*-oreo*)

      themuppets_branch="lineage-15.1"

      android_version="8.1"

      use_openjdk_from_ubuntu=true

      ;;

    *pie*)

    v*-pie*)

      themuppets_branch="lineage-16.0"

      android_version="9"

      ;;

    *q*)

    v*-q*)

      themuppets_branch="lineage-17.1"

      android_version="10"

      ;;

    *r*)

    v*-r*)

      themuppets_branch="lineage-18.1"

      android_version="11"

      ;;

    *s*)

    v*-s*)

      themuppets_branch="lineage-19.1"

      android_version="12"

      ;;

    *t*)

    v*-t*)

      themuppets_branch="lineage-20.0"

      android_version="13"

      ;;