From 49300cb6e26ab688228d392667904bdb8c902f86 Mon Sep 17 00:00:00 2001 From: vapormusic Date: Sat, 21 May 2022 09:46:22 +0700 Subject: [PATCH] semver fix --- .circleci/config.yml | 2 +- resources/afterPack.js | 49 +++++++++++++++++++++--------------------- resources/version.sh | 2 +- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e382f738..c97688a8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,7 @@ jobs: # command: sed -i 's/github:ciderapp\/Cider/github:ciderapp\/cider-releases/' package.json - run: name: Update Version Number of App - command: chmod +x resources/version.sh && ./resources/version.sh + command: sudo chmod +x resources/version.sh && ./resources/version.sh - run: name: Update Package Managers command: sudo npm update -g npm yarn diff --git a/resources/afterPack.js b/resources/afterPack.js index 55dcbc91..25756541 100644 --- a/resources/afterPack.js +++ b/resources/afterPack.js @@ -1,31 +1,32 @@ exports.default = function(context) { - const { execSync } = require('child_process') - const fs = require('fs') + // const { execSync } = require('child_process') + // const fs = require('fs') - if (process.platform !== 'darwin') - return + // if (process.platform !== 'darwin') + // return - if (fs.existsSync('dist/mac-universal--x64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Electron Framework.sig')) - fs.unlinkSync('dist/mac-universal--x64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Electron Framework.sig') - if (fs.existsSync('dist/mac-universal--arm64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Electron Framework.sig')) - fs.unlinkSync('dist/mac-universal--arm64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Electron Framework.sig') - console.log('Castlabs-evs update start') - execSync('python3 -m pip install --upgrade castlabs-evs') - console.log('Castlabs-evs update complete') + // if (fs.existsSync('dist/mac-universal--x64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Electron Framework.sig')) + // fs.unlinkSync('dist/mac-universal--x64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Electron Framework.sig') + // if (fs.existsSync('dist/mac-universal--arm64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Electron Framework.sig')) + // fs.unlinkSync('dist/mac-universal--arm64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Electron Framework.sig') + // console.log('Castlabs-evs update start') + // execSync('python3 -m pip install --upgrade castlabs-evs') + // console.log('Castlabs-evs update complete') - // xcode 13 - if (fs.existsSync('dist/mac-universal--x64') && fs.existsSync('dist/mac-universal--arm64')) - execSync("cp 'dist/mac-universal--x64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib' 'dist/mac-universal--arm64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib'",{stdio: 'inherit'}) + // // xcode 13 + // if (fs.existsSync('dist/mac-universal--x64') && fs.existsSync('dist/mac-universal--arm64')) + // execSync("cp 'dist/mac-universal--x64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib' 'dist/mac-universal--arm64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib'",{stdio: 'inherit'}) - console.log('VMP signing start') - if (fs.existsSync('dist/mac-universal')) - execSync('python3 -m castlabs_evs.vmp -n sign-pkg dist/mac-universal',{stdio: 'inherit'}) - if (fs.existsSync('dist/mac')) - execSync('python3 -m castlabs_evs.vmp -n sign-pkg dist/mac',{stdio: 'inherit'}) - if (fs.existsSync('dist/mac-arm64')) - execSync('python3 -m castlabs_evs.vmp -n sign-pkg dist/mac-arm64 -z',{stdio: 'inherit'}) - if (fs.existsSync('dist/mac-x64')) - execSync('python3 -m castlabs_evs.vmp -n sign-pkg dist/mac-x64',{stdio: 'inherit'}) + // console.log('VMP signing start') + // if (fs.existsSync('dist/mac-universal')) + // execSync('python3 -m castlabs_evs.vmp -n sign-pkg dist/mac-universal',{stdio: 'inherit'}) + // if (fs.existsSync('dist/mac')) + // execSync('python3 -m castlabs_evs.vmp -n sign-pkg dist/mac',{stdio: 'inherit'}) + // if (fs.existsSync('dist/mac-arm64')) + // execSync('python3 -m castlabs_evs.vmp -n sign-pkg dist/mac-arm64 -z',{stdio: 'inherit'}) + // if (fs.existsSync('dist/mac-x64')) + // execSync('python3 -m castlabs_evs.vmp -n sign-pkg dist/mac-x64',{stdio: 'inherit'}) - console.log('VMP signing complete') + // console.log('VMP signing complete') + return ; } \ No newline at end of file diff --git a/resources/version.sh b/resources/version.sh index 5daefd13..5e44e382 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