diff --git a/package.json b/package.json index f320424d..68325a7a 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "cider", "applicationId": "Cider", "productName": "Cider", - "version": "1.5.0", + "version": "1.5.0-alpha.13", "description": "A new cross-platform Apple Music experience based on Electron and Vue.js written from scratch with performance in mind.", "license": "AGPL-3.0", "main": "./build/index.js", diff --git a/resources/version.sh b/resources/version.sh index 404521cd..54c50c8d 100755 --- a/resources/version.sh +++ b/resources/version.sh @@ -3,13 +3,18 @@ LATEST_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep sha | cut -d '"' -f 4 | sed 's/v//' | xargs) COMMITSINCESTABLE=$(git rev-list $LATEST_SHA..HEAD --count) CURRENT_VERSION=$(node -p -e "require('./package.json').version") -NEW_VERSION=${CURRENT_VERSION/0/$COMMITSINCESTABLE} -if [[ $COMMITSINCESTABLE -gt 0 ]] -then +CIRCLE_BRANCH="main" +if [[ $CIRCLE_BRANCH == "main" && $COMMITSINCESTABLE -gt 0 ]]; then + NEW_VERSION="${CURRENT_VERSION}-alpha.${COMMITSINCESTABLE}" +else + NEW_VERSION=${CURRENT_VERSION/0/$COMMITSINCESTABLE} +fi + +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 0" + echo "Version unchanged, commits since stable is ${COMMITSINCESTABLE}" fi -echo "export APP_VERSION=$(node -p -e 'require("./package.json").version')" >> $BASH_ENV +echo "export APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$BASH_ENV