From 54d04326c66744980dbb44b6e41d04743a54da56 Mon Sep 17 00:00:00 2001 From: Paul Clarke Date: Tue, 21 Nov 2017 09:17:15 +0000 Subject: [PATCH 1/2] :construction: debugging on circleci --- nodeApps/generateSignedFile.js | 13 +++++++++---- package.json | 2 +- src/utils.js | 2 ++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/nodeApps/generateSignedFile.js b/nodeApps/generateSignedFile.js index 603bbac..07a4469 100755 --- a/nodeApps/generateSignedFile.js +++ b/nodeApps/generateSignedFile.js @@ -9,7 +9,8 @@ const git = require('simple-git')() const releaseBranch = process.env.releaseBranch || 'staging' const name = process.env.npm_package_name const version = process.env.npm_package_version -const distPath = path.resolve(process.cwd(), '/dist') +console.log('process.cwd() is', process.cwd()) +const distPath = process.cwd() const checkPrerequisites = callback => { if (!process.env.npm_package_name) return callback('ERROR: run this as an npm script (npm run release)') @@ -46,22 +47,26 @@ const checkBranch = callback => { const checkAlreadyReleased = callback => { const fullPath = path.resolve(`${distPath}/${name}.min.${version}.js`) if (fs.existsSync(fullPath)) { - return callback(`Already exported ${name}.min.${version}.js`) + return callback(`Already exported ${distPath}${name}.min.${version}.js`) } callback() } const build = callback => { if (!process.env.npm_package_scripts_build) return callback() + console.log('building...') exec('npm run build', (err, result) => { + console.log('build got', err, result) callback(err) }) } const getSignature = (file, callback) => { utils.createVersionedDistFile(file, (err, versionedFile) => { + console.log('createVersionedDistFile got', err, versionedFile) if (err) return callback(err) utils.getIntegrity(versionedFile, (err, signature) => { + console.log('getIntegrity got', err, signature) if (err) return callback(err) callback(err, versionedFile, signature) }) @@ -92,8 +97,8 @@ const addFile = (file, callback) => { }) } -const addStagingFile = addFile.bind(null, `dist/${name}.staging.min.${version}.js`) -const addProductionFile = addFile.bind(null, `dist/${name}.min.${version}.js`) +const addStagingFile = addFile.bind(null, `${distPath}/${name}.staging.min.${version}.js`) +const addProductionFile = addFile.bind(null, `${distPath}/${name}.min.${version}.js`) const addChangelog = addFile.bind(null, 'CHANGELOG.md') const commit = callback => { diff --git a/package.json b/package.json index f227a82..ceb3f7d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "deployment-helpers", - "version": "1.7.2", + "version": "1.7.3", "description": "A collection of scripts that can be used as part of a deployment process.", "main": "src/utils", "bin": { diff --git a/src/utils.js b/src/utils.js index 654129e..bd50875 100644 --- a/src/utils.js +++ b/src/utils.js @@ -15,6 +15,7 @@ devUtils.createVersionedDistFile = (file, callback) => { if (!process.env.npm_package_version) return callback('Version missing - must run this as an npm script') const versionedFile = file.replace('.js', `.${process.env.npm_package_version}.js`) const cmd = `cp ${file} ${versionedFile}` + console.log(cmd) childProcess.exec(cmd, err => { callback(err, versionedFile) }) @@ -22,5 +23,6 @@ devUtils.createVersionedDistFile = (file, callback) => { devUtils.getSignature = (file, callback) => { const cmd = `cat ${file} | openssl dgst -sha256 -binary | openssl enc -base64 -A` + console.log(cmd) childProcess.exec(cmd, callback) } From 4783c7c6f817f2f68d9c410ca2a10f8e0c686039 Mon Sep 17 00:00:00 2001 From: Paul Clarke Date: Tue, 21 Nov 2017 11:24:50 +0000 Subject: [PATCH 2/2] :grimacing: :gun: path.join not path.resolve --- nodeApps/generateSignedFile.js | 12 ++++-------- src/utils.js | 2 -- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/nodeApps/generateSignedFile.js b/nodeApps/generateSignedFile.js index 07a4469..5c591e9 100755 --- a/nodeApps/generateSignedFile.js +++ b/nodeApps/generateSignedFile.js @@ -9,8 +9,7 @@ const git = require('simple-git')() const releaseBranch = process.env.releaseBranch || 'staging' const name = process.env.npm_package_name const version = process.env.npm_package_version -console.log('process.cwd() is', process.cwd()) -const distPath = process.cwd() +const distPath = path.join(process.cwd(), '/dist') const checkPrerequisites = callback => { if (!process.env.npm_package_name) return callback('ERROR: run this as an npm script (npm run release)') @@ -54,19 +53,15 @@ const checkAlreadyReleased = callback => { const build = callback => { if (!process.env.npm_package_scripts_build) return callback() - console.log('building...') exec('npm run build', (err, result) => { - console.log('build got', err, result) callback(err) }) } const getSignature = (file, callback) => { utils.createVersionedDistFile(file, (err, versionedFile) => { - console.log('createVersionedDistFile got', err, versionedFile) if (err) return callback(err) utils.getIntegrity(versionedFile, (err, signature) => { - console.log('getIntegrity got', err, signature) if (err) return callback(err) callback(err, versionedFile, signature) }) @@ -79,11 +74,12 @@ const getSignedProductionFile = getSignature.bind(null, `${distPath}/${name}.min const updateChangelog = (versionedFile, signature, callback) => { fs.readFile('CHANGELOG.md', 'utf-8', (readErr, contents) => { if (readErr) return callback(readErr) - const existingLines = new RegExp(`.*${versionedFile}.*`, 'g') + const file = ('' + versionedFile).replace(distPath, '') + const existingLines = new RegExp(`.*${file}.*`, 'g') const newContents = contents .replace(existingLines, '') .replace(/\n\s*\n/g, '\n') - .replace('# Changelog', `# Changelog \n\n- ${versionedFile} - signature: ${signature}`) + .replace('# Changelog', `# Changelog \n\n- ${file} - signature: ${signature}`) fs.writeFile('CHANGELOG.md', newContents, function (writeErr) { if (writeErr) return callback(writeErr) callback() diff --git a/src/utils.js b/src/utils.js index bd50875..654129e 100644 --- a/src/utils.js +++ b/src/utils.js @@ -15,7 +15,6 @@ devUtils.createVersionedDistFile = (file, callback) => { if (!process.env.npm_package_version) return callback('Version missing - must run this as an npm script') const versionedFile = file.replace('.js', `.${process.env.npm_package_version}.js`) const cmd = `cp ${file} ${versionedFile}` - console.log(cmd) childProcess.exec(cmd, err => { callback(err, versionedFile) }) @@ -23,6 +22,5 @@ devUtils.createVersionedDistFile = (file, callback) => { devUtils.getSignature = (file, callback) => { const cmd = `cat ${file} | openssl dgst -sha256 -binary | openssl enc -base64 -A` - console.log(cmd) childProcess.exec(cmd, callback) }