Bump v3.0.0-beta.1

atom/browser/resources/mac/Info.plist

@@ -17,9 +17,9 @@
   <key>CFBundleIconFile</key>
   <string>electron.icns</string>
   <key>CFBundleVersion</key>
-  <string>2.0.2</string>
+  <string>3.0.0</string>
   <key>CFBundleShortVersionString</key>
-  <string>2.0.2</string>
+  <string>3.0.0</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 2,0,2,0
- PRODUCTVERSION 2,0,2,0
+ FILEVERSION 3,0,0,1
+ PRODUCTVERSION 3,0,0,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -74,12 +74,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "GitHub, Inc."
             VALUE "FileDescription", "Electron"
-            VALUE "FileVersion", "2.0.2"
+            VALUE "FileVersion", "3.0.0"
             VALUE "InternalName", "electron.exe"
             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
             VALUE "OriginalFilename", "electron.exe"
             VALUE "ProductName", "Electron"
-            VALUE "ProductVersion", "2.0.2"
+            VALUE "ProductVersion", "3.0.0"
             VALUE "SquirrelAwareVersion", "1"
         END
     END

atom/common/atom_version.h

@@ -5,10 +5,10 @@
 #ifndef ATOM_COMMON_ATOM_VERSION_H_
 #define ATOM_COMMON_ATOM_VERSION_H_
 
-#define ATOM_MAJOR_VERSION 2
+#define ATOM_MAJOR_VERSION 3
 #define ATOM_MINOR_VERSION 0
-#define ATOM_PATCH_VERSION 2
-// #define ATOM_PRE_RELEASE_VERSION
+#define ATOM_PATCH_VERSION 0
+#define ATOM_PRE_RELEASE_VERSION -beta.1
 
 #ifndef ATOM_STRINGIFY
 #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)

electron.gyp

@@ -4,7 +4,7 @@
     'product_name%': 'Electron',
     'company_name%': 'GitHub, Inc',
     'company_abbr%': 'github',
-    'version%': '2.0.2',
+    'version%': '3.0.0-beta.1',
     'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
   },
   'includes': [

package.json

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

script/bump-version.py

@@ -192,7 +192,7 @@ def update_package_json(version, suffix):
 
 
 def tag_version(version, suffix):
-  execute(['git', 'commit', '-a', '-m', 'Bump v{0}'.format(version + suffix)])
+  execute(['git', 'commit', '-a', '--no-verify', '-m', 'Bump v{0}'.format(version + suffix)])
 
 
 if __name__ == '__main__':

script/prepare-release.js

@@ -75,7 +75,7 @@ async function getReleaseNotes (currentBranch) {
   let githubOpts = {
     owner: 'electron',
     repo: 'electron',
-    base: `v${pkg.version}`,
+    base: `2a97e48465a3af9e5448a8d06c1d65d16c516e8f`,
     head: currentBranch
   }
   let releaseNotes