From 338d429d48cc7491d507f4df2b7ac73dd79e3ee7 Mon Sep 17 00:00:00 2001 From: joshaber Date: Tue, 24 Nov 2015 15:41:28 -0500 Subject: [PATCH] REVERT ME: Hacks on hacks on hacks to test. --- build/tasks/publish-build-task.coffee | 22 +++++++++++++--------- build/tasks/set-version-task.coffee | 4 ++-- package.json | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/build/tasks/publish-build-task.coffee b/build/tasks/publish-build-task.coffee index b375123d3..518ccc77e 100644 --- a/build/tasks/publish-build-task.coffee +++ b/build/tasks/publish-build-task.coffee @@ -37,8 +37,8 @@ module.exports = (gruntObject) -> isPrerelease = false when 'beta' isPrerelease = true - else - return + # else + # return doneCallback = @async() startTime = Date.now() @@ -55,12 +55,16 @@ module.exports = (gruntObject) -> zipAssets buildDir, assets, (error) -> return done(error) if error? - getAtomDraftRelease isPrerelease, channel, (error, release) -> - return done(error) if error? - assetNames = (asset.assetName for asset in assets) - deleteExistingAssets release, assetNames, (error) -> - return done(error) if error? - uploadAssets(release, buildDir, assets, done) + uploadAssets({tag_name: 'v1.1'}, buildDir, assets, done) + + # zipAssets buildDir, assets, (error) -> + # return done(error) if error? + # getAtomDraftRelease isPrerelease, channel, (error, release) -> + # return done(error) if error? + # assetNames = (asset.assetName for asset in assets) + # deleteExistingAssets release, assetNames, (error) -> + # return done(error) if error? + # uploadAssets(release, buildDir, assets, done) getAssets = -> {cp} = require('./task-helpers')(grunt) @@ -260,6 +264,6 @@ uploadAssets = (release, buildDir, assets, callback) -> tasks = [] for {assetName} in assets assetPath = path.join(buildDir, assetName) - tasks.push(uploadToReleases.bind(this, release, assetName, assetPath)) + # tasks.push(uploadToReleases.bind(this, release, assetName, assetPath)) tasks.push(uploadToS3.bind(this, release, assetName, assetPath)) async.parallel(tasks, callback) diff --git a/build/tasks/set-version-task.coffee b/build/tasks/set-version-task.coffee index 28abb6493..99c147c53 100644 --- a/build/tasks/set-version-task.coffee +++ b/build/tasks/set-version-task.coffee @@ -5,9 +5,9 @@ module.exports = (grunt) -> {spawn} = require('./task-helpers')(grunt) getVersion = (callback) -> - releasableBranches = ['stable', 'beta'] + releasableBranches = ['stable', 'beta', 'upload-to-s3'] channel = grunt.config.get('atom.channel') - shouldUseCommitHash = if channel in releasableBranches then false else true + shouldUseCommitHash = false # if channel in releasableBranches then false else true inRepository = fs.existsSync(path.resolve(__dirname, '..', '..', '.git')) {version} = require(path.join(grunt.config.get('atom.appDir'), 'package.json')) if shouldUseCommitHash and inRepository diff --git a/package.json b/package.json index 0ffc69221..2b563bf7c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "atom", "productName": "Atom", - "version": "1.4.0-dev", + "version": "1.1.0-dev", "description": "A hackable text editor for the 21st Century.", "main": "./src/browser/main.js", "repository": {