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

Commit b5a6cdf9 authored by Jackeagle's avatar Jackeagle
Browse files

Merge branch '2989-master-fix-tag-detection-logic' into 'master' 

build.sh: Fixed incorrect tag detection logic in repo init.

See merge request !101
parents f3c59af2 67ac7f29

src/build.sh

+13 −4
Original line number Diff line number Diff line
@@ -163,16 +163,24 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then 
  echo ">> [$(date)] (Re)initializing branch repository"



  TAG_PREFIX=""

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

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



  # Fetch all tags and check for an exact match

  TAG_MATCH=$(curl -s --fail https://gitlab.e.foundation/api/v4/projects/659/repository/tags | jq -r ".[].name" | grep -Fx "$BRANCH_NAME")



  if [ -n "$TAG_MATCH" ]; then

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

      TAG_PREFIX="refs/tags/"

  fi



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

    REPO_INIT_PARAM="--depth ${REPO_INIT_DEPTH}"

  fi



  # Reset the default manifest if it exists

  if [ -f ".repo/manifests/default.xml" ]; then

    cd .repo/manifests/

    git checkout default.xml

    git reset --hard HEAD

    git clean -fd

    cd ../..

  fi
@@ -184,6 +192,7 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then 
  fi



  # Repo init source

  echo ">> [$(date)] Running: repo init $REPO_INIT_PARAM -u \"$REPO\" -b \"${TAG_PREFIX}${BRANCH_NAME}\" $REPO_GROUPS"

  yes | repo init $REPO_INIT_PARAM -u "$REPO" -b "${TAG_PREFIX}${BRANCH_NAME}" $REPO_GROUPS



  if [ "$REPO_CUSTOM_MANIFEST" != false ]; then