Merge pull request #8732 from atom/mb-stable-and-beta-releases

Upload assets to pre & production releases from beta & stable branches

build/package.json

@@ -11,7 +11,7 @@
     "donna": "1.0.10",
     "formidable": "~1.0.14",
     "fs-plus": "2.x",
-    "github-releases": "~0.2.0",
+    "github-releases": "~0.3.0",
     "glob": "^5.0.14",
     "grunt": "~0.4.1",
     "grunt-babel": "^5.0.1",
@@ -22,7 +22,7 @@
     "grunt-contrib-less": "~0.8.0",
     "grunt-cson": "0.15.0",
     "grunt-download-electron": "^2.1.1",
-    "grunt-electron-installer": "1.0.0",
+    "grunt-electron-installer": "1.0.3-0",
     "grunt-lesslint": "0.17.0",
     "grunt-peg": "~1.1.0",
     "grunt-shell": "~0.3.1",

build/tasks/mkrpm-task.coffee

@@ -24,6 +24,12 @@ module.exports = (grunt) ->
       return done("Unsupported arch #{process.arch}")
 
     {name, version, description} = grunt.file.readJSON('package.json')
+
+    # RPM versions can't have dashes in them.
+    # * http://www.rpm.org/max-rpm/ch-rpm-file-format.html
+    # * https://github.com/mojombo/semver/issues/145
+    version = version.replace(/-beta$/, "~beta")
+
     buildDir = grunt.config.get('atom.buildDir')
 
     rpmDir = path.join(buildDir, 'rpm')

build/tasks/publish-build-task.coffee

@@ -22,7 +22,7 @@ module.exports = (gruntObject) ->
   grunt.registerTask 'publish-build', 'Publish the built app', ->
     tasks = []
     tasks.push('build-docs', 'prepare-docs') if process.platform is 'darwin'
-    tasks.push('upload-assets') if process.env.JANKY_SHA1 and process.env.JANKY_BRANCH is 'master'
+    tasks.push('upload-assets')
     grunt.task.run(tasks)
 
   grunt.registerTask 'prepare-docs', 'Move api.json to atom-api.json', ->
@@ -31,6 +31,14 @@ module.exports = (gruntObject) ->
     cp path.join(docsOutputDir, 'api.json'), path.join(buildDir, 'atom-api.json')
 
   grunt.registerTask 'upload-assets', 'Upload the assets to a GitHub release', ->
+    switch process.env.JANKY_BRANCH
+      when 'stable'
+        isPrerelease = false
+      when 'beta'
+        isPrerelease = true
+      else
+        return
+
     doneCallback = @async()
     startTime = Date.now()
     done = (args...) ->
@@ -46,7 +54,7 @@ module.exports = (gruntObject) ->
 
     zipAssets buildDir, assets, (error) ->
       return done(error) if error?
-      getAtomDraftRelease (error, release) ->
+      getAtomDraftRelease isPrerelease, (error, release) ->
         return done(error) if error?
         assetNames = (asset.assetName for asset in assets)
         deleteExistingAssets release, assetNames, (error) ->
@@ -120,9 +128,9 @@ zipAssets = (buildDir, assets, callback) ->
     tasks.push(zip.bind(this, buildDir, sourcePath, assetName))
   async.parallel(tasks, callback)
 
-getAtomDraftRelease = (callback) ->
+getAtomDraftRelease = (isPrerelease, callback) ->
   atomRepo = new GitHub({repo: 'atom/atom', token})
-  atomRepo.getReleases (error, releases=[]) ->
+  atomRepo.getReleases {prerelease: isPrerelease}, (error, releases=[]) ->
     if error?
       logError('Fetching atom/atom releases failed', error, releases)
       callback(error)
@@ -142,9 +150,9 @@ getAtomDraftRelease = (callback) ->
             firstDraft.assets = assets
             callback(null, firstDraft)
       else
-        createAtomDraftRelease(callback)
+        createAtomDraftRelease(isPrerelease, callback)
 
-createAtomDraftRelease = (callback) ->
+createAtomDraftRelease = (isPrerelease, callback) ->
   {version} = require('../../package.json')
   options =
     uri: 'https://api.github.com/repos/atom/atom/releases'
@@ -152,6 +160,7 @@ createAtomDraftRelease = (callback) ->
     headers: defaultHeaders
     json:
       tag_name: "v#{version}"
+      prerelease: isPrerelease
       name: version
       draft: true
       body: """

build/tasks/set-version-task.coffee

@@ -5,7 +5,7 @@ module.exports = (grunt) ->
   {spawn} = require('./task-helpers')(grunt)
 
   getVersion = (callback) ->
-    onBuildMachine = process.env.JANKY_SHA1 and process.env.JANKY_BRANCH is 'master'
+    onBuildMachine = process.env.JANKY_SHA1 and process.env.JANKY_BRANCH in ['stable', 'beta']
     inRepository = fs.existsSync(path.resolve(__dirname, '..', '..', '.git'))
     {version} = require(path.join(grunt.config.get('atom.appDir'), 'package.json'))
     if onBuildMachine or not inRepository

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "1.0.12",
+  "version": "1.0.12-beta",
   "description": "A hackable text editor for the 21st Century.",
   "main": "./src/browser/main.js",
   "repository": {