diff --git a/scripts/release/win b/scripts/release/win index 5de23749df..05924af445 100755 --- a/scripts/release/win +++ b/scripts/release/win @@ -1,16 +1,11 @@ #!/usr/bin/env node -import qq from 'qqjs' import getVersion from '../utils/version.js' +import {run, shell, x} from '../utils/script-exec.js' -qq.config.silent = false -qq.run(async () => { +await run(async () => { const version = await getVersion() - await qq.x('./node_modules/.bin/oclif pack:win') - await qq.x(`mv dist/win/heroku-v${version}-x86.exe dist/win/heroku-v${version}-x86-unsigned.exe`) - await qq.x(`mv dist/win/heroku-v${version}-x64.exe dist/win/heroku-v${version}-x64-unsigned.exe`) - // await qq.x('echo "$HEROKU_WINDOWS_KEY" | base64 --decode > /tmp/heroku-windows-key') - // await qq.x(`osslsigncode -pkcs12 /tmp/heroku-windows-key -pass "$HEROKU_WINDOWS_SIGNING_PASS" -n 'Heroku CLI' -i https://toolbelt.heroku.com/ -h sha512 -in dist/win/heroku-v${version}-x86-unsigned.exe -out dist/win/heroku-v${version}-x86.exe`) - // await qq.x(`osslsigncode -pkcs12 /tmp/heroku-windows-key -pass "$HEROKU_WINDOWS_SIGNING_PASS" -n 'Heroku CLI' -i https://toolbelt.heroku.com/ -h sha512 -in dist/win/heroku-v${version}-x64-unsigned.exe -out dist/win/heroku-v${version}-x64.exe`) - // await qq.x('./node_modules/.bin/oclif upload:win') + await x('./node_modules/.bin/oclif', ['pack:win']) + await shell(`mv dist/win/heroku-v${version}-x86.exe dist/win/heroku-v${version}-x86-unsigned.exe`) + await shell(`mv dist/win/heroku-v${version}-x64.exe dist/win/heroku-v${version}-x64-unsigned.exe`) }) diff --git a/scripts/upload/deb b/scripts/upload/deb index 3387a5cd74..2a5ed7b888 100755 --- a/scripts/upload/deb +++ b/scripts/upload/deb @@ -1,12 +1,11 @@ #!/usr/bin/env node -import qq from 'qqjs' import getHerokuS3Bucket from '../utils/get-heroku-s3-bucket.js' +import {run, shell, x} from '../utils/script-exec.js' -qq.config.silent = false -qq.run(async () => { - await qq.x('./node_modules/.bin/oclif upload:deb') +await run(async () => { + await x('./node_modules/.bin/oclif', ['upload:deb']) const HEROKU_S3_BUCKET = await getHerokuS3Bucket() - await qq.x(`aws s3 cp --content-type text/plain --cache-control "max-age: 604800" /home/runner/work/cli/cli/dist/apt/release.key "s3://${HEROKU_S3_BUCKET}/channels/stable/apt/release.key"`) + await shell(`aws s3 cp --content-type text/plain --cache-control "max-age: 604800" /home/runner/work/cli/cli/dist/apt/release.key "s3://${HEROKU_S3_BUCKET}/channels/stable/apt/release.key"`) })