From 838ce7efcb0e4b008a9e23b29c7f5d5b997d9c6e Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Wed, 3 Aug 2022 16:25:17 +0100 Subject: [PATCH] Updated version.sh --- resources/version.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/version.sh b/resources/version.sh index 6a895302..c5c51b42 100755 --- a/resources/version.sh +++ b/resources/version.sh @@ -1,17 +1,19 @@ #!/bin/bash +printenv + STABLE_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep '"sha"' | head -1 | cut -d '"' -f 4) SHA_DATE=$(git show -s --format=%ci $STABLE_SHA) COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count --since="$SHA_DATE") CURRENT_VERSION=$(node -p -e "require('./package.json').version") -if [[ ($CIRCLE_BRANCH == "main" || $GITHUB_REF_NAME == "main") && $COMMITSINCESTABLE -gt 0 ]]; then +if [[ ($CIRCLE_BRANCH != "stable" && $GITHUB_REF_NAME != "stable") && $COMMITSINCESTABLE -gt 0 ]]; then NEW_VERSION="${CURRENT_VERSION}-beta.${COMMITSINCESTABLE}" else NEW_VERSION=${CURRENT_VERSION/0/$COMMITSINCESTABLE} fi +echo "Version: $NEW_VERSION" if [[ $COMMITSINCESTABLE -gt 0 ]]; then - echo "Version: $NEW_VERSION" sed -i "0,/$CURRENT_VERSION/s//$NEW_VERSION/" package.json else echo "Version unchanged, commits since stable is ${COMMITSINCESTABLE}" @@ -21,4 +23,4 @@ if [[ -z "${GITHUB_ENV}" ]]; then echo "APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$GITHUB_ENV elif [[ -z "${BASH_ENV}" ]]; then echo "export APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$BASH_ENV -fi \ No newline at end of file +fi