mirror of
https://github.com/Foundry376/Mailspring.git
synced 2025-10-10 05:06:07 +08:00
ci(*): Fix Mac build filenames, zip uploads
This commit is contained in:
parent
584da13788
commit
84a8b4f98f
1 changed files with 8 additions and 5 deletions
|
@ -28,7 +28,10 @@ module.exports = (grunt) ->
|
||||||
return reject() if error
|
return reject() if error
|
||||||
commitHash = stdout?.trim?()
|
commitHash = stdout?.trim?()
|
||||||
packageVersion = json.version
|
packageVersion = json.version
|
||||||
fullVersion = "#{json.version}-#{commitHash}"
|
if packageVersion.indexOf('-') > 0
|
||||||
|
fullVersion = packageVersion
|
||||||
|
else
|
||||||
|
fullVersion = "#{packageVersion}-#{commitHash}"
|
||||||
resolve()
|
resolve()
|
||||||
|
|
||||||
runEmailIntegrationTest = ->
|
runEmailIntegrationTest = ->
|
||||||
|
@ -108,7 +111,7 @@ module.exports = (grunt) ->
|
||||||
|
|
||||||
spawn
|
spawn
|
||||||
cmd: "zip"
|
cmd: "zip"
|
||||||
args: ["-9", "-y", "-r", zipFilepath, filepath]
|
args: ["-9", "-y", "-r", zipFilepath, filename]
|
||||||
, (error) ->
|
, (error) ->
|
||||||
process.chdir(orig)
|
process.chdir(orig)
|
||||||
if error
|
if error
|
||||||
|
@ -144,9 +147,9 @@ module.exports = (grunt) ->
|
||||||
uploadPromises.push uploadToS3(dmgName(), "#{process.platform}/N1-#{fullVersion}.dmg")
|
uploadPromises.push uploadToS3(dmgName(), "#{process.platform}/N1-#{fullVersion}.dmg")
|
||||||
uploadPromises.push uploadZipToS3(appName(), "#{process.platform}/N1-#{fullVersion}.zip")
|
uploadPromises.push uploadZipToS3(appName(), "#{process.platform}/N1-#{fullVersion}.zip")
|
||||||
if process.platform is 'win32'
|
if process.platform is 'win32'
|
||||||
uploadPromises.push uploadToS3("installer/"+winReleasesName(), "#{process.platform}/nylas-#{fullVersion}-RELEASES.txt")
|
uploadPromises.push uploadToS3("installer/"+winReleasesName(), "#{process.platform}/N1-#{fullVersion}-RELEASES.txt")
|
||||||
uploadPromises.push uploadToS3("installer/"+winSetupName(), "#{process.platform}/nylas-#{fullVersion}.exe")
|
uploadPromises.push uploadToS3("installer/"+winSetupName(), "#{process.platform}/N1-#{fullVersion}.exe")
|
||||||
uploadPromises.push uploadToS3("installer/"+winNupkgName(), "#{process.platform}/nylas-#{fullVersion}-full.nupkg")
|
uploadPromises.push uploadToS3("installer/"+winNupkgName(), "#{process.platform}/N1-#{fullVersion}-full.nupkg")
|
||||||
|
|
||||||
Promise.all(uploadPromises).then(done).catch (err) ->
|
Promise.all(uploadPromises).then(done).catch (err) ->
|
||||||
grunt.log.error(err)
|
grunt.log.error(err)
|
||||||
|
|
Loading…
Add table
Reference in a new issue