diff --git a/.circleci/config.yml b/.circleci/config.yml index 05157590..7f2f3990 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -156,13 +156,13 @@ jobs: mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts - store_artifacts: path: ~/Cider/dist/artifacts - - run: - name: Set App Version - command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV + # - run: + # name: Set App Version + # command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV - run: name: Publish Release command: | - gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap + gh release create "v${APP_VERSION}" --title "Cider Version ${APP_VERSION} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap # Orchestrate our job run sequence workflows: diff --git a/resources/circle.js b/resources/circle.js index 3c56bc92..112fbdee 100644 --- a/resources/circle.js +++ b/resources/circle.js @@ -5,7 +5,6 @@ if (!process.env['CIRCLECI']) { const {readFileSync, writeFile} = require('fs') const pkg = JSON.parse(readFileSync('package.json').toString()); - let channel = process.env['CIRCLE_BRANCH']; if (process.env['CIRCLE_BRANCH'] === 'lts') { @@ -20,7 +19,8 @@ channel = channel.split('/').join('-') // https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables const version = pkg.version.split('.'); -pkg.version = `${version[0]}.${version[1]}.${version[2]}-${channel}.${version[3]}` +const patch = version[2].split('-'); +pkg.version = `${version[0]}.${version[1]}.${patch[0]}-${channel}.${patch[1]}` // package.build.channel = channel pkg.publish = { "provider": "github", diff --git a/resources/version.sh b/resources/version.sh index 5daefd13..f374b7e9 100755 --- a/resources/version.sh +++ b/resources/version.sh @@ -4,5 +4,5 @@ LATESTSHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable COMMITSINCESTABLE=$(git rev-list $LATESTSHA..HEAD --count) VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1) echo -NEWVERSION=${VERSION/-/.}.$COMMITSINCESTABLE +NEWVERSION=${VERSION/-/.}-$COMMITSINCESTABLE npm version $NEWVERSION \ No newline at end of file