diff --git a/resources/circle.js b/resources/circle.js index b327abd9..b5da981e 100644 --- a/resources/circle.js +++ b/resources/circle.js @@ -15,7 +15,7 @@ const patch = version[2].split('-'); if (process.env['CIRCLE_BRANCH'] === 'release') { pkg.version = `${version[0]}.${version[1]}.${patch[0]}` } else if (process.env['CIRCLE_BRANCH'] === 'main') { - pkg.version = `${version[0]}.${version[1]}.${patch[0]}-beta.${patch[1]}` + pkg.version = `${version[0]}.${version[1]}.${patch[0]}.beta.${patch[1]}` } else { pkg.version = `${version[0]}.${version[1]}.${patch[0]}-${channel}.${process.env['CIRCLE_BUILD_NUM']}` } diff --git a/resources/version.sh b/resources/version.sh index f374b7e9..3e3850df 100755 --- a/resources/version.sh +++ b/resources/version.sh @@ -1,8 +1,8 @@ #!/bin/bash -LATESTSHA=$(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 $LATESTSHA..HEAD --count) -VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1) -echo -NEWVERSION=${VERSION/-/.}-$COMMITSINCESTABLE -npm version $NEWVERSION \ No newline at end of file +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/-/.}.$COMMITSINCESTABLE +echo "Version: $NEW_VERSION" +sed -i "0,/$CURRENT_VERSION/s//$NEW_VERSION/" package.json