mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

build: fix usage of octokit/rest and make uploading better (#26386)

Browse source
This commit is contained in:
Samuel Attard 2020-11-09 12:30:43 -08:00 • committed by GitHub
commit dcffa7449a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.circleci/config.yml
View file

@ -674,10 +674,10 @@ step-electron-publish: &step-electron-publish
cd src/electron cd src/electron
if [ "$UPLOAD_TO_S3" == "1" ]; then if [ "$UPLOAD_TO_S3" == "1" ]; then
echo 'Uploading Electron release distribution to S3' echo 'Uploading Electron release distribution to S3'
script/release/uploaders/upload.py --upload_to_s3 script/release/uploaders/upload.py --verbose --upload_to_s3
else else
echo 'Uploading Electron release distribution to Github releases' echo 'Uploading Electron release distribution to Github releases'
script/release/uploaders/upload.py script/release/uploaders/upload.py --verbose
fi fi
step-persist-data-for-tests: &step-persist-data-for-tests step-persist-data-for-tests: &step-persist-data-for-tests

4
appveyor.yml
View file

@ -226,10 +226,10 @@ deploy_script:
if (Test-Path Env:\ELECTRON_RELEASE) { if (Test-Path Env:\ELECTRON_RELEASE) {
if (Test-Path Env:\UPLOAD_TO_S3) { if (Test-Path Env:\UPLOAD_TO_S3) {
Write-Output "Uploading Electron release distribution to s3" Write-Output "Uploading Electron release distribution to s3"
& python script\release\uploaders\upload.py --upload_to_s3 & python script\release\uploaders\upload.py --verbose --upload_to_s3
} else { } else {
Write-Output "Uploading Electron release distribution to github releases" Write-Output "Uploading Electron release distribution to github releases"
& python script\release\uploaders\upload.py & python script\release\uploaders\upload.py --verbose
} }
} elseif (Test-Path Env:\TEST_WOA) { } elseif (Test-Path Env:\TEST_WOA) {
node script/release/ci-release-build.js --job=electron-woa-testing --ci=VSTS --armTest --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH node script/release/ci-release-build.js --job=electron-woa-testing --ci=VSTS --armTest --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH

2
script/release/uploaders/upload-to-github.js
View file

@ -51,7 +51,7 @@ function uploadToGitHub () {
console.log(`Error uploading ${fileName} to GitHub, will retry. Error was:`, err); console.log(`Error uploading ${fileName} to GitHub, will retry. Error was:`, err);
retry++; retry++;
octokit.repos.listAssetsForRelease({ octokit.repos.listReleaseAssets({
owner: 'electron', owner: 'electron',
repo: targetRepo, repo: targetRepo,
release_id: releaseId, release_id: releaseId,

19
script/release/uploaders/upload.py
View file

@ -17,7 +17,7 @@ sys.path.append(
from zipfile import ZipFile from zipfile import ZipFile
from lib.config import PLATFORM, get_target_arch, get_env_var, s3_config, \ from lib.config import PLATFORM, get_target_arch, get_env_var, s3_config, \
get_zip_name get_zip_name, enable_verbose_mode, get_platform_key
from lib.util import get_electron_branding, execute, get_electron_version, \ from lib.util import get_electron_branding, execute, get_electron_version, \
s3put, get_electron_exec, get_out_dir, \ s3put, get_electron_exec, get_out_dir, \
SRC_DIR, ELECTRON_DIR SRC_DIR, ELECTRON_DIR
@ -42,7 +42,9 @@ TOOLCHAIN_PROFILE_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION,
def main(): def main():
args = parse_args() args = parse_args()
if args.upload_to_s3: if args.verbose:
enable_verbose_mode()
if args.upload_to_s3:
utcnow = datetime.datetime.utcnow() utcnow = datetime.datetime.utcnow()
args.upload_timestamp = utcnow.strftime('%Y%m%d') args.upload_timestamp = utcnow.strftime('%Y%m%d')
@ -74,12 +76,14 @@ def main():
symbols_zip = os.path.join(OUT_DIR, SYMBOLS_NAME) symbols_zip = os.path.join(OUT_DIR, SYMBOLS_NAME)
shutil.copy2(os.path.join(OUT_DIR, 'symbols.zip'), symbols_zip) shutil.copy2(os.path.join(OUT_DIR, 'symbols.zip'), symbols_zip)
upload_electron(release, symbols_zip, args) upload_electron(release, symbols_zip, args)
if PLATFORM == 'darwin': if get_platform_key() == 'darwin':
api_path = os.path.join(ELECTRON_DIR, 'electron-api.json') if get_target_arch() == 'x64':
upload_electron(release, api_path, args) api_path = os.path.join(ELECTRON_DIR, 'electron-api.json')
upload_electron(release, api_path, args)
ts_defs_path = os.path.join(ELECTRON_DIR, 'electron.d.ts')
upload_electron(release, ts_defs_path, args)
ts_defs_path = os.path.join(ELECTRON_DIR, 'electron.d.ts')
upload_electron(release, ts_defs_path, args)
dsym_zip = os.path.join(OUT_DIR, DSYM_NAME) dsym_zip = os.path.join(OUT_DIR, DSYM_NAME)
shutil.copy2(os.path.join(OUT_DIR, 'dsym.zip'), dsym_zip) shutil.copy2(os.path.join(OUT_DIR, 'dsym.zip'), dsym_zip)
upload_electron(release, dsym_zip, args) upload_electron(release, dsym_zip, args)
@ -151,6 +155,7 @@ def parse_args():
action='store_true', action='store_true',
default=False, default=False,
required=False) required=False)
parser.add_argument('--verbose', help='Mooooorreee logs')
return parser.parse_args() return parser.parse_args()