diff --git a/scripts/release b/scripts/release index abe913629..5acb6356e 100755 --- a/scripts/release +++ b/scripts/release @@ -205,15 +205,15 @@ async function createRelease(options) { if (!fs.existsSync(options.code)) return exit('code must be a valid file'); // "gpgconf --reload gpg-agent" is handy to reset existing password in the agent. See https://dev.gnupg.org/T3485 for pinentry-mode (--pinentry-mode=loopback --batch --passphrase ${passphrase} works if we want to gassword protect - console.log('Computing GPG signature...'); + console.log(`${env.tag} Computing GPG signature...`); safe.fs.unlinkSync(`${options.code}.sig`); execSync(`gpg --no-default-keyring --local-user 0EADB19CDDA23CD0FE71E3470A372F8703C493CC --output ${options.code}.sig --detach-sig ${options.code}`, { stdio: [ null, process.stdout, process.stderr ] } ); - console.log('Uploading source code tarball and signature...'); + console.log(`${env.tag} Uploading source code tarball and signature...`); const sourceTarballName = path.basename(options.code); - execSync(`rsync ${options.code} ubuntu@${env.releasesServer}:/home/ubuntu/releases/${sourceTarballName}`, { stdio: [ null, process.stdout, process.stderr ] } ); - execSync(`rsync ${options.code}.sig ubuntu@${env.releasesServer}:/home/ubuntu/releases/${sourceTarballName}.sig`, { stdio: [ null, process.stdout, process.stderr ] } ); + execSync(`rsync --progress ${options.code} ubuntu@${env.releasesServer}:/home/ubuntu/releases/${sourceTarballName}`, { stdio: [ null, process.stdout, process.stderr ] } ); + execSync(`rsync --progress ${options.code}.sig ubuntu@${env.releasesServer}:/home/ubuntu/releases/${sourceTarballName}.sig`, { stdio: [ null, process.stdout, process.stderr ] } ); options.code = `https://${env.releasesServer}/${sourceTarballName}`; } @@ -240,7 +240,7 @@ async function createRelease(options) { releases[secondLastVersion].next = null; delete releases[lastVersion]; - console.log('Reverting %s', lastVersion); + console.log(`${env.tag} Reverting ${lastVersion}`); return await verifyAndUpload(env, releases); }