From ef5f588e26650f1e754a6e0a46e92b3c5eedbeec Mon Sep 17 00:00:00 2001 From: Inga Lovinde <52715130+inga-lovinde@users.noreply.github.com> Date: Wed, 21 Dec 2016 13:20:11 +0300 Subject: [PATCH] packform now writes version.txt --- BuildServer/lib/builder.js | 11 ++++++++++- BuildServer/lib/tasks/dotnetrewrite.js | 11 +---------- BuildServer/lib/tasks/packform.js | 7 +++++++ 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/BuildServer/lib/builder.js b/BuildServer/lib/builder.js index 8db830d..96cdd8f 100644 --- a/BuildServer/lib/builder.js +++ b/BuildServer/lib/builder.js @@ -43,6 +43,14 @@ const build = (options, callback) => { const release = options.app.get('releasepath') + "/" + owner + "/" + reponame + "/" + branch + "/" + rev; const statusQueue = async.queue((task, callback) => task(callback), 1); const actualGitLoader = skipGitLoader ? (options, callback) => process.nextTick(callback) : gitLoader; + const date = new Date(); + const versionInfo = date.getFullYear() + "." + + (date.getMonth() + 1) + "." + + date.getDate() + "." + + (date.getHours() * 100 + date.getMinutes()) + "; " + + "built from " + rev + "; " + + "repository: " + owner + "/" + reponame + "; " + + "branch: " + branch; statusQueue.push((callback) => notifyStatus({ state: "pending", @@ -135,7 +143,8 @@ const build = (options, callback) => { rev: rev, tmp: tmp, exported: exported, - release: release + release: release, + versionInfo: versionInfo }, (err, result) => { if (err) { return done(err, result); diff --git a/BuildServer/lib/tasks/dotnetrewrite.js b/BuildServer/lib/tasks/dotnetrewrite.js index f2e6abc..c7616ce 100644 --- a/BuildServer/lib/tasks/dotnetrewrite.js +++ b/BuildServer/lib/tasks/dotnetrewrite.js @@ -15,15 +15,6 @@ module.exports = (params, processor) => ({ processor.context.dotnetrewriterDone = true; - const date = new Date(); - const version = date.getFullYear() + "." + - (date.getMonth() + 1) + "." + - date.getDate() + "." + - (date.getHours() * 100 + date.getMinutes()) + "; " + - "built from " + processor.context.rev + "; " + - "repository: " + processor.context.owner + "/" + processor.context.reponame + "; " + - "branch: " + processor.context.branch; - const processAssemblyInfo = (appendInformationalVersion) => (content, cb) => { if (!params.skipCodeSigning && !settings.skipCodeSigning) { content = content.replace( @@ -33,7 +24,7 @@ module.exports = (params, processor) => ({ } if (appendInformationalVersion) { - content = addAssemblyAttribute(content, "[assembly: System.Reflection.AssemblyInformationalVersion(\"" + version + "\")]"); + content = addAssemblyAttribute(content, "[assembly: System.Reflection.AssemblyInformationalVersion(\"" + processor.context.versionInfo + "\")]"); } return cb(null, content); diff --git a/BuildServer/lib/tasks/packform.js b/BuildServer/lib/tasks/packform.js index 4f20225..88a9a47 100644 --- a/BuildServer/lib/tasks/packform.js +++ b/BuildServer/lib/tasks/packform.js @@ -10,6 +10,13 @@ module.exports = (params, processor) => sequential({ { type: "cssnanoall" }, + { + type: "writefile", + params: { + filename: "version.txt", + data: processor.context.versionInfo + } + }, { type: "zip", params: {