From e63ca48fe9e306f3053c99c37dc82e9829a47458 Mon Sep 17 00:00:00 2001 From: Francois Marier Date: Mon, 9 Mar 2020 14:05:25 -0700 Subject: [PATCH] Move LICENSE file generation to create_dist (fixes #8618) This will ensure that the licensing script runs for all CI builds even if we change the build config for them. --- lib/build.js | 5 ----- lib/createDist.js | 2 ++ 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/build.js b/lib/build.js index 5efa3be61b02c..afcd087664c59 100644 --- a/lib/build.js +++ b/lib/build.js @@ -1,5 +1,4 @@ const config = require('../lib/config') -const licensing = require('../lib/licensing') const util = require('../lib/util') const path = require('path') const fs = require('fs-extra') @@ -94,10 +93,6 @@ const build = (buildConfig = config.defaultBuildConfig, options) => { touchOverriddenFiles() touchOverriddenVectorIconFiles() util.updateBranding() - if (buildConfig === 'Release') { - // TODO(bsclifton): uncomment when we can address problem - // licensing.updateLicenses() - } if (config.xcode_gen_target) { util.generateXcodeWorkspace() diff --git a/lib/createDist.js b/lib/createDist.js index 2510d3c99a0f7..8ede4bdededb0 100644 --- a/lib/createDist.js +++ b/lib/createDist.js @@ -1,4 +1,5 @@ const config = require('../lib/config') +const licensing = require('../lib/licensing') const util = require('../lib/util') const path = require('path') const fs = require('fs-extra') @@ -14,6 +15,7 @@ const createDist = (buildConfig = config.defaultBuildConfig, options) => { } util.updateBranding() + licensing.updateLicenses() fs.removeSync(path.join(config.outputDir, 'dist')) config.buildTarget = 'create_dist' util.buildTarget()