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

Commit ce27fffb authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

build: Change zip name to with pipeline id

parent cb3e1a2e

build-community.sh

+20 −8
Original line number Diff line number Diff line
@@ -183,11 +183,12 @@ for branch in ${BRANCH_NAME//,/ }; do 
    PRODUCT_VERSION_MAJOR=$(grep -oP 'PRODUCT_VERSION_MAJOR = \K.*' "$config_file")

    PRODUCT_VERSION_MINOR=$(grep -oP 'PRODUCT_VERSION_MINOR = \K.*' "$config_file")

    PRODUCT_VERSION_MAINTENANCE=$(grep -oP 'PRODUCT_VERSION_MAINTENANCE := \K.*' "$config_file")

    PRODUCT_PRERELEASE_STRING=$(grep -oP 'PRODUCT_PRERELEASE_STRING := \K.*' "$config_file")



    # Check if PRODUCT_VERSION_MAINTENANCE is not equal to 0

    e_ver="$PRODUCT_VERSION_MAJOR.$PRODUCT_VERSION_MINOR"

    e_ver="$PRODUCT_VERSION_MAJOR.$PRODUCT_VERSION_MINOR$PRODUCT_PRERELEASE_STRING"

    if [ "$PRODUCT_VERSION_MAINTENANCE" != "0" ]; then

      e_ver="$PRODUCT_VERSION_MAJOR.$PRODUCT_VERSION_MINOR.$PRODUCT_VERSION_MAINTENANCE"

      e_ver="$PRODUCT_VERSION_MAJOR.$PRODUCT_VERSION_MINOR.$PRODUCT_VERSION_MAINTENANCE$PRODUCT_PRERELEASE_STRING"

    fi



    echo ">> [$(date)] Setting \"$RELEASE_TYPE\" as release type"
@@ -235,9 +236,6 @@ for branch in ${BRANCH_NAME//,/ }; do 
    echo ">> [$(date)] Preparing build environment"

    source build/envsetup.sh >/dev/null



    ANDROID_BUILD_ID=$(grep -o 'BUILD_ID=.*' "build/make/core/build_id.mk" | cut -d "=" -f 2 | cut -c 1 | tr '[:upper:]' '[:lower:]')

    APEX_PACKAGE_LIST=$(cat "/root/apex.list")



    if [ -f /root/userscripts/before.sh ]; then

      echo ">> [$(date)] Running before.sh"

      /root/userscripts/before.sh
@@ -323,7 +321,7 @@ for branch in ${BRANCH_NAME//,/ }; do 
        ln -fs /usr/bin/python2 /usr/bin/python



        export BUILD_DATETIME=$(date -u +%s)

        export BUILD_NUMBER=$(date -u -d @$BUILD_DATETIME +%Y%m%d00)

        export BUILD_NUMBER=$(date -u -d @$BUILD_DATETIME +%Y%m%d)${CI_PIPELINE_ID}



        export BUILD_USERNAME=eos

        export BUILD_HOSTNAME=eos
@@ -332,6 +330,15 @@ for branch in ${BRANCH_NAME//,/ }; do 
        echo ">> [$(date)] BUILD_DATETIME=$BUILD_DATETIME"

        echo ">> [$(date)] BUILD_NUMBER=$BUILD_NUMBER"



        if [[ "${BRANCH_NAME}" = *"rc"* ]] || [[ "${BRANCH_NAME}" = *"alpha"* ]] || [[ "${BRANCH_NAME}" == *"beta"* ]]; then

          PRODUCT_PRERELEASE=$(echo ${BRANCH_NAME} | sed -E 's/v[0-9]*\.[0-9]*(\.[0-9]*)?-(beta|alpha|rc).*/\2/')

          export PRODUCT_PRERELEASE

          if [[ "${BRANCH_NAME}" = *"rc."* ]] || [[ "${BRANCH_NAME}" = *"alpha."* ]] || [[ "${BRANCH_NAME}" == *"beta."* ]]; then

            PRODUCT_PRERELEASE_VERSION=$(echo ${BRANCH_NAME} | sed -E 's/v[0-9]*\.[0-9]*(\.[0-9]*)?-.*.\.([0-9]*).*/\2/')

            export PRODUCT_PRERELEASE_VERSION

          fi

        fi



        BRUNCH_DEVICE=${codename}



        if [ "${ENG_BUILD}" = true ]; then
@@ -363,7 +370,11 @@ for branch in ${BRANCH_NAME//,/ }; do 


          # Set the target files name

          TARGET_FILES=lineage_$DEVICE-target_files-$BUILD_NUMBER.zip

          E_VERSION=e-$e_ver-$ANDROID_BUILD_ID-$(date -u +%Y%m%d%H%M%S)-$RELEASE_TYPE-${DEVICE}.zip

          E_BRANCH_NAME=$e_ver-${branch_dir,,}

          if [[ "${BRANCH_NAME}" = *"rc"* ]] || [[ "${BRANCH_NAME}" = *"alpha"* ]] || [[ "${BRANCH_NAME}" == *"beta"* ]]; then

            E_BRANCH_NAME=$(sed 's/^v//' <<<"${BRANCH_NAME}")

          fi

          E_VERSION=e-$E_BRANCH_NAME-$BUILD_NUMBER-$RELEASE_TYPE-${DEVICE}.zip



          # Remove release-keys from build as its still using test-keys.

          if [ "$SIGN_BUILDS" != true ]; then
@@ -372,7 +383,8 @@ for branch in ${BRANCH_NAME//,/ }; do 
            SIGN_TARGETS=(-o -d "user-keys")

          fi



          if [[ "$ANDROID_BUILD_ID" == [st] ]]; then

          if [ "$android_version_major" -ge 12 ]; then

            APEX_PACKAGE_LIST=$(cat "/root/apex.list")

            for PACKAGE in $APEX_PACKAGE_LIST; do

              if [ -f "user-keys/$PACKAGE.pem" ] &&

                [ -f "user-keys/$PACKAGE.x509.pem" ] &&

src/build.sh

+19 −7
Original line number Diff line number Diff line
@@ -178,11 +178,12 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then 
  PRODUCT_VERSION_MAJOR=$(grep -oP 'PRODUCT_VERSION_MAJOR = \K.*' "$config_file")

  PRODUCT_VERSION_MINOR=$(grep -oP 'PRODUCT_VERSION_MINOR = \K.*' "$config_file")

  PRODUCT_VERSION_MAINTENANCE=$(grep -oP 'PRODUCT_VERSION_MAINTENANCE := \K.*' "$config_file")

  PRODUCT_PRERELEASE_STRING=$(grep -oP 'PRODUCT_PRERELEASE_STRING := \K.*' "$config_file")



  # Check if PRODUCT_VERSION_MAINTENANCE is not equal to 0

  e_ver="$PRODUCT_VERSION_MAJOR.$PRODUCT_VERSION_MINOR"

  e_ver="$PRODUCT_VERSION_MAJOR.$PRODUCT_VERSION_MINOR$PRODUCT_PRERELEASE_STRING"

  if [ "$PRODUCT_VERSION_MAINTENANCE" != "0" ]; then

    e_ver="$PRODUCT_VERSION_MAJOR.$PRODUCT_VERSION_MINOR.$PRODUCT_VERSION_MAINTENANCE"

    e_ver="$PRODUCT_VERSION_MAJOR.$PRODUCT_VERSION_MINOR.$PRODUCT_VERSION_MAINTENANCE$PRODUCT_PRERELEASE_STRING"

  fi



  if [ "$SIGN_BUILDS" = true ]; then
@@ -209,9 +210,6 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then 
  echo ">> [$(date)] Preparing build environment"

  source build/envsetup.sh >/dev/null



  ANDROID_BUILD_ID=$(grep -o 'BUILD_ID=.*' "build/make/core/build_id.mk" | cut -d "=" -f 2 | cut -c 1 | tr '[:upper:]' '[:lower:]')

  APEX_PACKAGE_LIST=$(cat "/root/apex.list")



  if [ -f /root/userscripts/before.sh ]; then

    echo ">> [$(date)] Running before.sh"

    /root/userscripts/before.sh
@@ -282,7 +280,7 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then 
    fi



    export BUILD_DATETIME=$(date -u +%s)

    export BUILD_NUMBER=$(date -u -d @$BUILD_DATETIME +%Y%m%d00)

    export BUILD_NUMBER=$(date -u -d @$BUILD_DATETIME +%Y%m%d)${CI_PIPELINE_ID}



    export BUILD_USERNAME=eos

    export BUILD_HOSTNAME=eos
@@ -291,6 +289,15 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then 
    echo ">> [$(date)] BUILD_DATETIME=$BUILD_DATETIME"

    echo ">> [$(date)] BUILD_NUMBER=$BUILD_NUMBER"



    if [[ "${BRANCH_NAME}" = *"rc"* ]] || [[ "${BRANCH_NAME}" = *"alpha"* ]] || [[ "${BRANCH_NAME}" == *"beta"* ]]; then

      PRODUCT_PRERELEASE=$(echo ${BRANCH_NAME} | sed -E 's/v[0-9]*\.[0-9]*(\.[0-9]*)?-(beta|alpha|rc).*/\2/')

      export PRODUCT_PRERELEASE

      if [[ "${BRANCH_NAME}" = *"rc."* ]] || [[ "${BRANCH_NAME}" = *"alpha."* ]] || [[ "${BRANCH_NAME}" == *"beta."* ]]; then

        PRODUCT_PRERELEASE_VERSION=$(echo ${BRANCH_NAME} | sed -E 's/v[0-9]*\.[0-9]*(\.[0-9]*)?-.*.\.([0-9]*).*/\2/')

        export PRODUCT_PRERELEASE_VERSION

      fi

    fi



    build_success=false

    if [ "${BUILD_ONLY_SYSTEMIMAGE}" = true ]; then

      breakfast "${BRUNCH_DEVICE}"
@@ -315,7 +322,11 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then 


      # Set the target files name

      TARGET_FILES=lineage_$DEVICE-target_files-$BUILD_NUMBER.zip

      E_VERSION=e-$e_ver-$ANDROID_BUILD_ID-$(date -u +%Y%m%d%H%M%S)-$RELEASE_TYPE-${DEVICE}.zip

      E_BRANCH_NAME=$e_ver-${branch_dir,,}

      if [[ "${BRANCH_NAME}" = *"rc"* ]] || [[ "${BRANCH_NAME}" = *"alpha"* ]] || [[ "${BRANCH_NAME}" == *"beta"* ]]; then

        E_BRANCH_NAME=$(sed 's/^v//' <<<"${BRANCH_NAME}")

      fi

      E_VERSION=e-$E_BRANCH_NAME-$BUILD_NUMBER-$RELEASE_TYPE-${DEVICE}.zip



      # Remove release-keys from build as its still using test-keys.

      if [ "$SIGN_BUILDS" != true ]; then
@@ -325,6 +336,7 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then 
      fi



      if [ "$android_version_major" -ge 12 ]; then

        APEX_PACKAGE_LIST=$(cat "/root/apex.list")

        for PACKAGE in $APEX_PACKAGE_LIST; do

          if [ -f "user-keys/$PACKAGE.pem" ] &&

            [ -f "user-keys/$PACKAGE.x509.pem" ] &&