atom_shell -> electron
This commit is contained in:
Kevin Sawicki
parent
7e209dd982
commit
94c8b0e1b1
8 changed files with 60 additions and 60 deletions
|
|
@ -9,13 +9,13 @@ import tempfile
|
|||
|
||||
from lib.config import PLATFORM, get_target_arch, get_chromedriver_version, \
|
||||
get_platform_key
|
||||
from lib.util import atom_gyp, execute, get_atom_shell_version, parse_version, \
|
||||
from lib.util import atom_gyp, execute, get_electron_version, parse_version, \
|
||||
scoped_cwd
|
||||
from lib.github import GitHub
|
||||
|
||||
|
||||
ATOM_SHELL_REPO = 'electron/electron'
|
||||
ATOM_SHELL_VERSION = get_atom_shell_version()
|
||||
ELECTRON_REPO = 'electron/electron'
|
||||
ELECTRON_VERSION = get_electron_version()
|
||||
|
||||
PROJECT_NAME = atom_gyp()['project_name%']
|
||||
PRODUCT_NAME = atom_gyp()['product_name%']
|
||||
|
|
@ -24,15 +24,15 @@ SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
|
|||
OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'R')
|
||||
DIST_DIR = os.path.join(SOURCE_ROOT, 'dist')
|
||||
DIST_NAME = '{0}-{1}-{2}-{3}.zip'.format(PROJECT_NAME,
|
||||
ATOM_SHELL_VERSION,
|
||||
ELECTRON_VERSION,
|
||||
get_platform_key(),
|
||||
get_target_arch())
|
||||
SYMBOLS_NAME = '{0}-{1}-{2}-{3}-symbols.zip'.format(PROJECT_NAME,
|
||||
ATOM_SHELL_VERSION,
|
||||
ELECTRON_VERSION,
|
||||
get_platform_key(),
|
||||
get_target_arch())
|
||||
DSYM_NAME = '{0}-{1}-{2}-{3}-dsym.zip'.format(PROJECT_NAME,
|
||||
ATOM_SHELL_VERSION,
|
||||
ELECTRON_VERSION,
|
||||
get_platform_key(),
|
||||
get_target_arch())
|
||||
|
||||
|
|
@ -45,16 +45,16 @@ def main():
|
|||
create_dist = os.path.join(SOURCE_ROOT, 'script', 'create-dist.py')
|
||||
execute([sys.executable, create_dist])
|
||||
|
||||
build_version = get_atom_shell_build_version()
|
||||
if not ATOM_SHELL_VERSION.startswith(build_version):
|
||||
build_version = get_electron_build_version()
|
||||
if not ELECTRON_VERSION.startswith(build_version):
|
||||
error = 'Tag name ({0}) should match build version ({1})\n'.format(
|
||||
ATOM_SHELL_VERSION, build_version)
|
||||
ELECTRON_VERSION, build_version)
|
||||
sys.stderr.write(error)
|
||||
sys.stderr.flush()
|
||||
return 1
|
||||
|
||||
github = GitHub(auth_token())
|
||||
releases = github.repos(ATOM_SHELL_REPO).releases.get()
|
||||
releases = github.repos(ELECTRON_REPO).releases.get()
|
||||
tag_exists = False
|
||||
for release in releases:
|
||||
if not release['draft'] and release['tag_name'] == args.version:
|
||||
|
|
@ -68,7 +68,7 @@ def main():
|
|||
# Upload the SHASUMS.txt.
|
||||
execute([sys.executable,
|
||||
os.path.join(SOURCE_ROOT, 'script', 'upload-checksums.py'),
|
||||
'-v', ATOM_SHELL_VERSION])
|
||||
'-v', ELECTRON_VERSION])
|
||||
|
||||
# Upload the index.json.
|
||||
execute([sys.executable,
|
||||
|
|
@ -81,24 +81,24 @@ def main():
|
|||
return
|
||||
|
||||
# Upload atom-shell with GitHub Releases API.
|
||||
upload_atom_shell(github, release, os.path.join(DIST_DIR, DIST_NAME))
|
||||
upload_atom_shell(github, release, os.path.join(DIST_DIR, SYMBOLS_NAME))
|
||||
upload_electron(github, release, os.path.join(DIST_DIR, DIST_NAME))
|
||||
upload_electron(github, release, os.path.join(DIST_DIR, SYMBOLS_NAME))
|
||||
if PLATFORM == 'darwin':
|
||||
upload_atom_shell(github, release, os.path.join(DIST_DIR, DSYM_NAME))
|
||||
upload_electron(github, release, os.path.join(DIST_DIR, DSYM_NAME))
|
||||
|
||||
# Upload free version of ffmpeg.
|
||||
ffmpeg = 'ffmpeg-{0}-{1}-{2}.zip'.format(
|
||||
ATOM_SHELL_VERSION, get_platform_key(), get_target_arch())
|
||||
upload_atom_shell(github, release, os.path.join(DIST_DIR, ffmpeg))
|
||||
ELECTRON_VERSION, get_platform_key(), get_target_arch())
|
||||
upload_electron(github, release, os.path.join(DIST_DIR, ffmpeg))
|
||||
|
||||
# Upload chromedriver and mksnapshot for minor version update.
|
||||
if parse_version(args.version)[2] == '0':
|
||||
chromedriver = 'chromedriver-{0}-{1}-{2}.zip'.format(
|
||||
get_chromedriver_version(), get_platform_key(), get_target_arch())
|
||||
upload_atom_shell(github, release, os.path.join(DIST_DIR, chromedriver))
|
||||
upload_electron(github, release, os.path.join(DIST_DIR, chromedriver))
|
||||
mksnapshot = 'mksnapshot-{0}-{1}-{2}.zip'.format(
|
||||
ATOM_SHELL_VERSION, get_platform_key(), get_target_arch())
|
||||
upload_atom_shell(github, release, os.path.join(DIST_DIR, mksnapshot))
|
||||
ELECTRON_VERSION, get_platform_key(), get_target_arch())
|
||||
upload_electron(github, release, os.path.join(DIST_DIR, mksnapshot))
|
||||
|
||||
if PLATFORM == 'win32' and not tag_exists:
|
||||
# Upload PDBs to Windows symbol server.
|
||||
|
|
@ -114,28 +114,28 @@ def main():
|
|||
def parse_args():
|
||||
parser = argparse.ArgumentParser(description='upload distribution file')
|
||||
parser.add_argument('-v', '--version', help='Specify the version',
|
||||
default=ATOM_SHELL_VERSION)
|
||||
default=ELECTRON_VERSION)
|
||||
parser.add_argument('-p', '--publish-release',
|
||||
help='Publish the release',
|
||||
action='store_true')
|
||||
return parser.parse_args()
|
||||
|
||||
|
||||
def get_atom_shell_build_version():
|
||||
def get_electron_build_version():
|
||||
if get_target_arch() == 'arm' or os.environ.has_key('CI'):
|
||||
# In CI we just build as told.
|
||||
return ATOM_SHELL_VERSION
|
||||
return ELECTRON_VERSION
|
||||
if PLATFORM == 'darwin':
|
||||
atom_shell = os.path.join(SOURCE_ROOT, 'out', 'R',
|
||||
electron = os.path.join(SOURCE_ROOT, 'out', 'R',
|
||||
'{0}.app'.format(PRODUCT_NAME), 'Contents',
|
||||
'MacOS', PRODUCT_NAME)
|
||||
elif PLATFORM == 'win32':
|
||||
atom_shell = os.path.join(SOURCE_ROOT, 'out', 'R',
|
||||
electron = os.path.join(SOURCE_ROOT, 'out', 'R',
|
||||
'{0}.exe'.format(PROJECT_NAME))
|
||||
else:
|
||||
atom_shell = os.path.join(SOURCE_ROOT, 'out', 'R', PROJECT_NAME)
|
||||
electron = os.path.join(SOURCE_ROOT, 'out', 'R', PROJECT_NAME)
|
||||
|
||||
return subprocess.check_output([atom_shell, '--version']).strip()
|
||||
return subprocess.check_output([electron, '--version']).strip()
|
||||
|
||||
|
||||
def dist_newer_than_head():
|
||||
|
|
@ -192,17 +192,17 @@ def create_release_draft(github, tag):
|
|||
sys.exit(0)
|
||||
|
||||
data = dict(tag_name=tag, name=name, body=body, draft=True)
|
||||
r = github.repos(ATOM_SHELL_REPO).releases.post(data=data)
|
||||
r = github.repos(ELECTRON_REPO).releases.post(data=data)
|
||||
return r
|
||||
|
||||
|
||||
def upload_atom_shell(github, release, file_path):
|
||||
def upload_electron(github, release, file_path):
|
||||
# Delete the original file before uploading in CI.
|
||||
if os.environ.has_key('CI'):
|
||||
try:
|
||||
for asset in release['assets']:
|
||||
if asset['name'] == os.path.basename(file_path):
|
||||
github.repos(ATOM_SHELL_REPO).releases.assets(asset['id']).delete()
|
||||
github.repos(ELECTRON_REPO).releases.assets(asset['id']).delete()
|
||||
break
|
||||
except Exception:
|
||||
pass
|
||||
|
|
@ -211,18 +211,18 @@ def upload_atom_shell(github, release, file_path):
|
|||
params = {'name': os.path.basename(file_path)}
|
||||
headers = {'Content-Type': 'application/zip'}
|
||||
with open(file_path, 'rb') as f:
|
||||
github.repos(ATOM_SHELL_REPO).releases(release['id']).assets.post(
|
||||
github.repos(ELECTRON_REPO).releases(release['id']).assets.post(
|
||||
params=params, headers=headers, data=f, verify=False)
|
||||
|
||||
|
||||
def publish_release(github, release_id):
|
||||
data = dict(draft=False)
|
||||
github.repos(ATOM_SHELL_REPO).releases(release_id).patch(data=data)
|
||||
github.repos(ELECTRON_REPO).releases(release_id).patch(data=data)
|
||||
|
||||
|
||||
def auth_token():
|
||||
token = os.environ.get('ATOM_SHELL_GITHUB_TOKEN')
|
||||
message = ('Error: Please set the $ATOM_SHELL_GITHUB_TOKEN '
|
||||
token = os.environ.get('ELECTRON_GITHUB_TOKEN')
|
||||
message = ('Error: Please set the $ELECTRON_GITHUB_TOKEN '
|
||||
'environment variable, which is your personal token')
|
||||
assert token, message
|
||||
return token
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue