v1.7.11

atom/browser/resources/mac/Info.plist

@@ -17,9 +17,9 @@
   <key>CFBundleIconFile</key>
   <string>electron.icns</string>
   <key>CFBundleVersion</key>
-  <string>1.7.10</string>
+  <string>1.7.11</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.7.10</string>
+  <string>1.7.11</string>
   <key>LSApplicationCategoryType</key>
   <string>public.app-category.developer-tools</string>
   <key>LSMinimumSystemVersion</key>

atom/browser/resources/win/atom.rc

@@ -56,8 +56,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,7,10,0
- PRODUCTVERSION 1,7,10,0
+ FILEVERSION 1,7,11,0
+ PRODUCTVERSION 1,7,11,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -74,12 +74,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "GitHub, Inc."
             VALUE "FileDescription", "Electron"
-            VALUE "FileVersion", "1.7.10"
+            VALUE "FileVersion", "1.7.11"
             VALUE "InternalName", "electron.exe"
             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
             VALUE "OriginalFilename", "electron.exe"
             VALUE "ProductName", "Electron"
-            VALUE "ProductVersion", "1.7.10"
+            VALUE "ProductVersion", "1.7.11"
             VALUE "SquirrelAwareVersion", "1"
         END
     END

atom/common/atom_version.h

@@ -7,7 +7,7 @@
 
 #define ATOM_MAJOR_VERSION 1
 #define ATOM_MINOR_VERSION 7
-#define ATOM_PATCH_VERSION 10
+#define ATOM_PATCH_VERSION 11
 // #define ATOM_PRE_RELEASE_VERSION
 #define ATOM_VERSION_IS_RELEASE 1
 

electron.gyp

@@ -4,7 +4,7 @@
     'product_name%': 'Electron',
     'company_name%': 'GitHub, Inc',
     'company_abbr%': 'github',
-    'version%': '1.7.10',
+    'version%': '1.7.11',
     'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
   },
   'includes': [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "1.7.10",
+  "version": "1.7.11",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {

script/merge-release.js

@@ -44,7 +44,7 @@ async function commitMerge () {
 
 async function mergeReleaseIntoBranch (branchName) {
   console.log(`Merging release branch into ${branchName}.`)
-  let mergeArgs = ['merge', 'release', '--squash']
+  let mergeArgs = ['merge', 'release-1-7-x', '--squash']
   let mergeDetails = await GitProcess.exec(mergeArgs, gitDir)
   if (mergeDetails.exitCode === 0) {
     return true
@@ -99,7 +99,7 @@ async function mergeRelease () {
   } else {
     console.log(`Trying rebase of ${branchToRelease} into release branch.`)
     await pull()
-    await checkoutBranch('release')
+    await checkoutBranch('release-1-7-x')
     let rebaseResult = await rebase(branchToRelease)
     if (rebaseResult) {
       let pushResult = pushBranch('HEAD')

script/prepare-release.js

@@ -29,7 +29,7 @@ github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
 
 async function createReleaseBranch () {
   console.log(`Creating release branch.`)
-  let checkoutDetails = await GitProcess.exec([ 'checkout', '-b', 'release' ], gitDir)
+  let checkoutDetails = await GitProcess.exec([ 'checkout', '-b', 'release-1-7-x' ], gitDir)
   if (checkoutDetails.exitCode === 0) {
     console.log(`${pass} Successfully created the release branch.`)
   } else {
@@ -160,7 +160,7 @@ async function pushRelease () {
 }
 
 async function runReleaseBuilds () {
-  await ciReleaseBuild('release', {
+  await ciReleaseBuild('release-1-7-x', {
     ghRelease: true
   })
 }

script/release.js

@@ -439,7 +439,7 @@ async function cleanupReleaseBranch () {
   console.log(`Cleaning up release branch.`)
   let errorMessage = `Could not delete local release branch.`
   let successMessage = `Successfully deleted local release branch.`
-  await callGit(['branch', '-D', 'release'], errorMessage, successMessage)
+  await callGit(['branch', '-D', 'release-1-7-x'], errorMessage, successMessage)
   errorMessage = `Could not delete remote release branch.`
   successMessage = `Successfully deleted remote release branch.`
   return callGit(['push', 'origin', ':release'], errorMessage, successMessage)