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

Verified Commit 36198bdb authored by Nicolas Gelot's avatar Nicolas Gelot
Browse files

Handle e tags without spam stdout

parent f7ff8f57

Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ RUN apt-get -qq update 
RUN apt-get -qqy upgrade



RUN apt-get install -y bc bison bsdmainutils build-essential ccache cgpt clang cron \

      curl flex g++-multilib gcc-multilib git git-lfs gnupg gperf imagemagick img2simg kmod \

      curl flex g++-multilib gcc-multilib git git-lfs gnupg gperf imagemagick img2simg kmod jq \

      lib32ncurses5-dev libncurses5 lib32readline-dev lib32z1-dev libtinfo5 liblz4-tool \

      libncurses5-dev libsdl1.2-dev libssl-dev libxml2 \

      libxml2-utils lsof lzop maven openjdk-8-jdk pngcrush \

Dockerfile.community

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ RUN apt-get -qq update 
RUN apt-get -qqy upgrade



RUN apt-get install -y bc bison bsdmainutils build-essential ccache cgpt clang cron \

      curl flex g++-multilib gcc-multilib git git-lfs gnupg gperf imagemagick kmod \

      curl flex g++-multilib gcc-multilib git git-lfs gnupg gperf imagemagick kmod jq \

      lib32ncurses5-dev libncurses5 lib32readline-dev lib32z1-dev libtinfo5 liblz4-tool \

      libncurses5-dev libsdl1.2-dev libssl-dev libxml2 \

      libxml2-utils lsof lzop maven pngcrush \

build-community.sh

+1 −2
Original line number Diff line number Diff line
@@ -139,8 +139,7 @@ for branch in ${BRANCH_NAME//,/ }; do 
      yes | repo init -u "$REPO" --reference "$MIRROR_DIR" -b "$branch" &>> "$repo_log"

    else

      TAG_PREFIX=""

      curl https://gitlab.e.foundation/api/v4/projects/659/repository/tags | grep "\"name\":\"$branch\""

      if [ $? == 0 ]

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

      then

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

        TAG_PREFIX="refs/tags/"

src/build.sh

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then 
  echo ">> [$(date)] (Re)initializing branch repository"



  TAG_PREFIX=""

  if curl https://gitlab.e.foundation/api/v4/projects/659/repository/tags | grep "\"name\":\"${BRANCH_NAME}\""

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

  then

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

    TAG_PREFIX="refs/tags/"