1 files changed, 31 insertions(+), 22 deletions(-)

M tools/daily_release.sh

@@ 1,4 1,4 @@
-#!/bin/bash -e
+#!/bin/bash 
 # Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 # For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 


@@ 10,13 10,17 @@ LOGIN=${LOGIN}
 TOKEN=${TOKEN}
 IMAGE_NAME=${IMAGE_NAME:-wearemudita/mudita_os_builder:1.9}
 WORK_DIR=${WORK_DIR:-MuditaOS}
-ARTEFACTS_DIR=${ARTEFACTS_DIR:-/artefacts}
 REPOSITORY_URL=${REPOSITORY_URL:-https://${TOKEN}:x-oauth-basic@github.com/mudita/MuditaOS}
+REPOSITORY_BRANCH=${REPOSITORY_BRANCH:-master}
+ARTIFACTS_DIR=${ARTIFACTS_DIR:-/artifacts/${REPOSITORY_BRANCH}}
+PRODUCT=${PRODUCT:-PurePhone}
 
 CONFIG_LOG=config.log
 
 VARS_TO_CHECK=(
+        PRODUCT
         REPOSITORY_URL
+        REPOSITORY_BRANCH
         LOGIN
         TOKEN
         IMAGE_NAME


@@ 52,23 56,26 @@ function addTokens(){
     git config user.apitoken ${TOKEN}
 }
 
-
 ##################### script ####################
 checkVariables
 
+if [ ! -d ${ARTIFACTS_DIR} ]; then
+    mkdir -p ${ARTIFACTS_DIR}
+fi
+
 if [ ! -d ${WORK_DIR} ]; then
-    mkdir ${WORK_DIR}
+    mkdir -p ${WORK_DIR}
 fi
 
 pushd ${WORK_DIR}
 
 if checkIfGit; then
-    git checkout master
-    git pull --ff-only 
+    git fetch --tags
+    git checkout ${REPOSITORY_BRANCH}
+    git pull --ff-only --tags
 else
     echo "not a git dir"
-    git clone ${REPOSITORY_URL} .
-    git checkout master
+    git clone -b ${REPOSITORY_BRANCH} ${REPOSITORY_URL} .
 fi
 
 if [ ! -d ccache ]; then


@@ 78,25 85,27 @@ fi
 CCACHE_DIR=$(pwd)/ccache
 export CCACHE_DIR
 
-
 DATE=$(date "+%Y.%m.%d")
+# gets latest release tag
+# please mind that if there are more than one tag - first will be taken
+LATEST=$(git tag -l | grep release\- | grep -E '[0-9]{1,2}.[0-9]{1,2}.[0-9]{1,2}' -o | tail -1)
+VERSION="${LATEST}-${DATE}"
+echo "Creating release with: $VERSION"
 
 addTokens
 git submodule update --init --recursive
-git tag -f daily-${DATE}
-git push --tags origin
-./configure.sh rt1051 RelWithDebInfo -G Ninja &> ${CONFIG_LOG}
-cat ${CONFIG_LOG}
-PKG_NAME_PREFIX=$(cat ${CONFIG_LOG} | grep CPACK_PACKAGE_FILE_NAME  | cut -f2 -d: | tr -d "'")
-cd build-rt1051-RelWithDebInfo
+git tag -f daily-${VERSION}
+git push origin daily-${VERSION}
+./configure.sh ${PRODUCT} rt1051 RelWithDebInfo -G Ninja
+cd build-${PRODUCT,,}-rt1051-RelWithDebInfo
 ninja
-ninja package-standalone
-ninja package-update
-
-cp ${PKG_NAME_PREFIX}-image.tar.xz ${ARTEFACTS_DIR}
-cp ${PKG_NAME_PREFIX}-Update.tar ${ARTEFACTS_DIR}
-
-popd
+ninja ${PRODUCT}-StandaloneImage
+ninja ${PRODUCT}-UpdatePackage
 
+PKG_NAME_PREFIX=${PRODUCT}-${LATEST}-RT1051
 
+echo "Copy assets to ${ARTIFACTS_DIR}" 
+cp *-image.tar.xz ${ARTIFACTS_DIR}/${PKG_NAME_PREFIX}-${DATE}-image.tar.xz
+cp *-Update.tar ${ARTIFACTS_DIR}/${PKG_NAME_PREFIX}-${DATE}-Update.tar
 
+popd