mirror of
https://github.com/Foundry376/Mailspring.git
synced 2024-11-10 17:48:50 +08:00
fix(build-flow): Undefined call to getVersion
This commit is contained in:
parent
c639b85fad
commit
4faf2b1de2
1 changed files with 13 additions and 11 deletions
|
@ -8,6 +8,10 @@ Promise = require 'bluebird'
|
|||
module.exports = (grunt) ->
|
||||
{cp, spawn, rm} = require('./task-helpers')(grunt)
|
||||
|
||||
getVersion = ->
|
||||
{version} = require(path.join(grunt.config.get('atom.appDir'), 'package.json'))
|
||||
return version
|
||||
|
||||
appName = -> grunt.config.get('atom.appName')
|
||||
dmgName = -> "#{appName().split('.')[0]}.dmg"
|
||||
zipName = -> "#{appName().split('.')[0]}.zip"
|
||||
|
@ -19,12 +23,13 @@ module.exports = (grunt) ->
|
|||
|
||||
runEmailIntegrationTest = (s3Client) ->
|
||||
buildDir = grunt.config.get('atom.buildDir')
|
||||
buildVersion = getVersion()
|
||||
new Promise (resolve, reject) ->
|
||||
appToRun = path.join(buildDir, appName())
|
||||
scriptToRun = "./build/run-build-and-send-screenshot.scpt"
|
||||
spawn
|
||||
cmd: "osascript"
|
||||
args: [scriptToRun, appToRun, getVersion()]
|
||||
args: [scriptToRun, appToRun, buildVersion]
|
||||
, (error) ->
|
||||
if error
|
||||
reject(error)
|
||||
|
@ -85,10 +90,6 @@ module.exports = (grunt) ->
|
|||
uploader.on "end", (data) ->
|
||||
resolve(data)
|
||||
|
||||
getVersion = ->
|
||||
{version} = require(path.join(grunt.config.get('atom.appDir'), 'package.json'))
|
||||
return version
|
||||
|
||||
uploadDMGToS3 = (s3Client) ->
|
||||
destName = "#{process.platform}/Edgehill_#{getVersion()}.dmg"
|
||||
dmgPath = path.join(grunt.config.get('atom.buildDir'), dmgName())
|
||||
|
@ -150,11 +151,12 @@ module.exports = (grunt) ->
|
|||
|
||||
s3Client = prepareS3()
|
||||
if s3Client
|
||||
Promise.all([runEmailIntegrationTest(), uploadDMGToS3(s3Client), uploadZipToS3(s3Client)])
|
||||
.then ->
|
||||
done()
|
||||
.catch (err) ->
|
||||
grunt.log.error(err)
|
||||
return false
|
||||
runEmailIntegrationTest().then ->
|
||||
Promise.all([uploadDMGToS3(s3Client), uploadZipToS3(s3Client)])
|
||||
.then ->
|
||||
done()
|
||||
.catch (err) ->
|
||||
grunt.log.error(err)
|
||||
return false
|
||||
else
|
||||
return false
|
||||
|
|
Loading…
Reference in a new issue