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

Verified Commit 4b82cf87 authored by Nicolas Gelot's avatar Nicolas Gelot
Browse files

Unify logs with date prefix

parent e2b98cf4

build-community.sh

+4 −4
Original line number Original line Diff line number Diff line
@@ -141,7 +141,7 @@ for branch in ${BRANCH_NAME//,/ }; do 
      TAG_PREFIX=""

      TAG_PREFIX=""

      if curl -s https://gitlab.e.foundation/api/v4/projects/659/repository/tags | jq -r ".[].name" | grep -q "${BRANCH_NAME}"

      if curl -s https://gitlab.e.foundation/api/v4/projects/659/repository/tags | jq -r ".[].name" | grep -q "${BRANCH_NAME}"

      then

      then

        echo "Branch name $branch is a tag on e/os/releases, prefix with refs/tags/ for 'repo init'"

        echo ">> [$(date)] Branch name $branch is a tag on e/os/releases, prefix with refs/tags/ for 'repo init'"

        TAG_PREFIX="refs/tags/"

        TAG_PREFIX="refs/tags/"

      fi

      fi
@@ -297,8 +297,8 @@ for branch in ${BRANCH_NAME//,/ }; do 
        # Start the build

        # Start the build

        echo ">> [$(date)] Starting build for $codename, $branch branch" | tee -a "$DEBUG_LOG"

        echo ">> [$(date)] Starting build for $codename, $branch branch" | tee -a "$DEBUG_LOG"

        build_successful=false

        build_successful=false

        echo "ANDROID_JACK_VM_ARGS=${ANDROID_JACK_VM_ARGS}"

        echo ">> [$(date)] ANDROID_JACK_VM_ARGS=${ANDROID_JACK_VM_ARGS}"

        echo "Switch to Python2"

        echo ">> [$(date)] Switch to Python2"

        ln -fs /usr/bin/python2 /usr/bin/python

        ln -fs /usr/bin/python2 /usr/bin/python
@@ -374,7 +374,7 @@ for branch in ${BRANCH_NAME//,/ }; do 
          fi

          fi

        fi

        fi





        echo "Switch back to Python3"

        echo ">> [$(date)] Switch back to Python3"

        ln -fs /usr/bin/python3 /usr/bin/python

        ln -fs /usr/bin/python3 /usr/bin/python

      fi

      fi

    done

    done

src/build.sh

+4 −4
Original line number Original line Diff line number Diff line
@@ -96,7 +96,7 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then 
  TAG_PREFIX=""

  TAG_PREFIX=""

  if curl -s https://gitlab.e.foundation/api/v4/projects/659/repository/tags | jq -r ".[].name" | grep -q ${BRANCH_NAME}

  if curl -s https://gitlab.e.foundation/api/v4/projects/659/repository/tags | jq -r ".[].name" | grep -q ${BRANCH_NAME}

  then

  then

    echo "Branch name ${BRANCH_NAME} is a tag on e/os/releases, prefix with refs/tags/ for 'repo init'"

    echo ">> [$(date)] Branch name ${BRANCH_NAME} is a tag on e/os/releases, prefix with refs/tags/ for 'repo init'"

    TAG_PREFIX="refs/tags/"

    TAG_PREFIX="refs/tags/"

  fi

  fi

  if [ -n ${REPO_INIT_DEPTH} ] && [ ${REPO_INIT_DEPTH} -gt 0 ]; then

  if [ -n ${REPO_INIT_DEPTH} ] && [ ${REPO_INIT_DEPTH} -gt 0 ]; then
@@ -240,8 +240,8 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then 
    # Start the build

    # Start the build

    echo ">> [$(date)] Starting build for ${DEVICE}, ${BRANCH_NAME} branch"

    echo ">> [$(date)] Starting build for ${DEVICE}, ${BRANCH_NAME} branch"

    build_successful=false

    build_successful=false

    echo "ANDROID_JACK_VM_ARGS=${ANDROID_JACK_VM_ARGS}"

    echo ">> [$(date)] ANDROID_JACK_VM_ARGS=${ANDROID_JACK_VM_ARGS}"

    echo "Switch to Python2"

    echo ">> [$(date)] Switch to Python2"

    ln -fs /usr/bin/python2 /usr/bin/python

    ln -fs /usr/bin/python2 /usr/bin/python





    BRUNCH_DEVICE=${DEVICE}

    BRUNCH_DEVICE=${DEVICE}
@@ -393,7 +393,7 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then 




  fi

  fi





  echo "Switch back to Python3"

  echo ">> [$(date)] Switch back to Python3"

  ln -fs /usr/bin/python3 /usr/bin/python

  ln -fs /usr/bin/python3 /usr/bin/python





fi

fi