From ae9fa772434af6aba91d01451e5e7361446482cf Mon Sep 17 00:00:00 2001 From: yazninja Date: Sat, 21 May 2022 13:14:46 +0800 Subject: [PATCH 1/5] echo app version --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 41c1f182..302d87bc 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: Show Environment Variable: APP_VERSION + command: echo $APP_VERSION - run: name: Publish Release command: | From 883c10f218fd038bee1de6d2f1c9ebbd07ac2be5 Mon Sep 17 00:00:00 2001 From: yazninja Date: Sat, 21 May 2022 13:19:05 +0800 Subject: [PATCH 2/5] test --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 302d87bc..d8dbf8e2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -160,7 +160,7 @@ jobs: name: Fix Versioning and Add Channel command: yarn circle:script - run: - name: Show Environment Variable: APP_VERSION + name: Show Environment Variable APP_VERSION command: echo $APP_VERSION - run: name: Publish Release From 323d3fc05a1120ccaf6edfb8dbdea1dd71f417ad Mon Sep 17 00:00:00 2001 From: yazninja Date: Sat, 21 May 2022 13:30:26 +0800 Subject: [PATCH 3/5] export app version to bashenv --- resources/circle.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/circle.js b/resources/circle.js index 4cbac3bf..38568bf4 100644 --- a/resources/circle.js +++ b/resources/circle.js @@ -34,7 +34,7 @@ pkg.publish = { const {exec} = require('child_process') -exec(`export APP_VERSION=${pkg.version} && echo $APP_VERSION`, {env: {'APP_VERSION': pkg.version}}, function (error, stdout, stderr) { +exec(`echo "export APP_VERSION=${pkg.version}" >> $BASH_ENV && echo $APP_VERSION`, {env: {'APP_VERSION': pkg.version}}, function (error, stdout, stderr) { console.log(stdout, stderr, error); }); From 12ab61e5e21684f68a12a59bebd1070f8deaaf65 Mon Sep 17 00:00:00 2001 From: yazninja Date: Sat, 21 May 2022 13:54:31 +0800 Subject: [PATCH 4/5] text v2 --- .circleci/config.yml | 4 ++-- resources/circle.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d8dbf8e2..a3625a1a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -160,8 +160,8 @@ jobs: name: Fix Versioning and Add Channel command: yarn circle:script - run: - name: Show Environment Variable APP_VERSION - command: echo $APP_VERSION + 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 38568bf4..199b32c6 100644 --- a/resources/circle.js +++ b/resources/circle.js @@ -34,13 +34,13 @@ pkg.publish = { const {exec} = require('child_process') -exec(`echo "export APP_VERSION=${pkg.version}" >> $BASH_ENV && echo $APP_VERSION`, {env: {'APP_VERSION': pkg.version}}, function (error, stdout, stderr) { +exec(`echo $APP_VERSION`, {env: {'APP_VERSION': pkg.version}}, function (error, stdout, stderr) { console.log(stdout, stderr, error); }); writeFile('package.json', JSON.stringify(pkg), err => { // error checking if (err) throw err; - console.log(`VERSION CHANGED TO ${pkg.version}`); + console.log(`VERSION CHANGED TO ${pkg.version}`, pkg); }); From b634989942b2ae9448a3dadf7853a12e82ba3027 Mon Sep 17 00:00:00 2001 From: maikirakiwi Date: Sat, 21 May 2022 00:16:26 -0700 Subject: [PATCH 5/5] Fix "An object could not be cloned." originated from vueapp.js --- src/renderer/main/vueapp.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index bab8e939..86edc823 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -818,7 +818,13 @@ const app = new Vue({ CiderAudio.audioNodes.gainNode.gain.value = gain } catch (e) { } } - } catch (e) { ipcRenderer.send('SoundCheckTag', event, tag); } // brute force until it works + } catch (e) { + try { ipcRenderer.send('SoundCheckTag', event, tag); } + catch (e) { + try {ipcRenderer.send('SoundCheckTag', event, tag);} + catch (e) {console.log("[Cider][MaikiwiSoundCheck] Error [Gave up after 3 consecutive attempts]: " + e)} + } + } // brute force until it works }) ipcRenderer.on('play', function (_event, mode, id) {