From b1c541083b5b9c85de317f826f4f23b2c579b68d Mon Sep 17 00:00:00 2001 From: yazninja Date: Sat, 21 May 2022 12:22:31 +0800 Subject: [PATCH 1/5] test versioning --- resources/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/version.sh b/resources/version.sh index f374b7e9..5daefd13 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 From df230a9dc0762af24c97ae10b28825d2bca195a5 Mon Sep 17 00:00:00 2001 From: yazninja Date: Sat, 21 May 2022 12:34:20 +0800 Subject: [PATCH 2/5] test semantic versioning --- .circleci/config.yml | 8 ++++---- resources/circle.js | 4 ++-- resources/version.sh | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) 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 From 3fb9107ad64690e5be7e9c0dcdb27cbb4ddf87bb Mon Sep 17 00:00:00 2001 From: yazninja Date: Sat, 21 May 2022 12:45:34 +0800 Subject: [PATCH 3/5] test v2 --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7f2f3990..590a785e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -156,9 +156,9 @@ 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: Fix Versioning and Add Channel + command: yarn circle:script - run: name: Publish Release command: | From 9223c99333d5bb353ab0797b29db68d3cc0a6202 Mon Sep 17 00:00:00 2001 From: yazninja Date: Sat, 21 May 2022 12:53:42 +0800 Subject: [PATCH 4/5] test release tag --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 590a785e..a3625a1a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -159,6 +159,9 @@ jobs: - run: name: Fix Versioning and Add Channel command: yarn circle:script + - 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: | From b69783b1c90b993a42fd34114c8f8aef5cc6a6a7 Mon Sep 17 00:00:00 2001 From: yazninja Date: Sat, 21 May 2022 13:05:01 +0800 Subject: [PATCH 5/5] test release tag v2 --- .circleci/config.yml | 6 +++--- resources/circle.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a3625a1a..41c1f182 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -159,9 +159,9 @@ jobs: - run: name: Fix Versioning and Add Channel command: yarn circle:script - - 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: | diff --git a/resources/circle.js b/resources/circle.js index 112fbdee..4cbac3bf 100644 --- a/resources/circle.js +++ b/resources/circle.js @@ -34,7 +34,7 @@ pkg.publish = { const {exec} = require('child_process') -exec('echo $APP_VERSION', {env: {'APP_VERSION': pkg.version}}, function (error, stdout, stderr) { +exec(`export APP_VERSION=${pkg.version} && echo $APP_VERSION`, {env: {'APP_VERSION': pkg.version}}, function (error, stdout, stderr) { console.log(stdout, stderr, error); });