Skip to content

Commit

Permalink
Move LICENSE file generation to create_dist (fixes #8618)
Browse files Browse the repository at this point in the history
This will ensure that the licensing script runs for all CI builds
even if we change the build config for them.
  • Loading branch information
fmarier committed Mar 10, 2020
1 parent c66871d commit e63ca48
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
5 changes: 0 additions & 5 deletions lib/build.js
Original file line number Diff line number Diff line change
@@ -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')
Expand Down Expand Up @@ -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()
Expand Down
2 changes: 2 additions & 0 deletions lib/createDist.js
Original file line number Diff line number Diff line change
@@ -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')
Expand All @@ -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()
Expand Down

0 comments on commit e63ca48

Please sign in to comment.