From dcffa7449a4b81896a0b09688c4206563b51d0f4 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Mon, 9 Nov 2020 12:30:43 -0800 Subject: [PATCH] build: fix usage of octokit/rest and make uploading better (#26386) --- .circleci/config.yml | 4 ++-- appveyor.yml | 4 ++-- script/release/uploaders/upload-to-github.js | 2 +- script/release/uploaders/upload.py | 19 ++++++++++++------- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index efdbcf65d0d7..92f89d4f281d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -674,10 +674,10 @@ step-electron-publish: &step-electron-publish cd src/electron if [ "$UPLOAD_TO_S3" == "1" ]; then 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 echo 'Uploading Electron release distribution to Github releases' - script/release/uploaders/upload.py + script/release/uploaders/upload.py --verbose fi step-persist-data-for-tests: &step-persist-data-for-tests diff --git a/appveyor.yml b/appveyor.yml index 7fff32319f23..36f7e5fd7705 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -226,10 +226,10 @@ deploy_script: if (Test-Path Env:\ELECTRON_RELEASE) { if (Test-Path Env:\UPLOAD_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 { 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) { node script/release/ci-release-build.js --job=electron-woa-testing --ci=VSTS --armTest --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH diff --git a/script/release/uploaders/upload-to-github.js b/script/release/uploaders/upload-to-github.js index e10cb603909f..0f08fbc7c2e6 100644 --- a/script/release/uploaders/upload-to-github.js +++ b/script/release/uploaders/upload-to-github.js @@ -51,7 +51,7 @@ function uploadToGitHub () { console.log(`Error uploading ${fileName} to GitHub, will retry. Error was:`, err); retry++; - octokit.repos.listAssetsForRelease({ + octokit.repos.listReleaseAssets({ owner: 'electron', repo: targetRepo, release_id: releaseId, diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py index 62395ce85585..d03c3593919c 100755 --- a/script/release/uploaders/upload.py +++ b/script/release/uploaders/upload.py @@ -17,7 +17,7 @@ sys.path.append( from zipfile import ZipFile 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, \ s3put, get_electron_exec, get_out_dir, \ SRC_DIR, ELECTRON_DIR @@ -42,7 +42,9 @@ TOOLCHAIN_PROFILE_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, def main(): args = parse_args() - if args.upload_to_s3: + if args.verbose: + enable_verbose_mode() + if args.upload_to_s3: utcnow = datetime.datetime.utcnow() args.upload_timestamp = utcnow.strftime('%Y%m%d') @@ -74,12 +76,14 @@ def main(): symbols_zip = os.path.join(OUT_DIR, SYMBOLS_NAME) shutil.copy2(os.path.join(OUT_DIR, 'symbols.zip'), symbols_zip) upload_electron(release, symbols_zip, args) - if PLATFORM == 'darwin': - api_path = os.path.join(ELECTRON_DIR, 'electron-api.json') - upload_electron(release, api_path, args) + if get_platform_key() == 'darwin': + if get_target_arch() == 'x64': + 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) shutil.copy2(os.path.join(OUT_DIR, 'dsym.zip'), dsym_zip) upload_electron(release, dsym_zip, args) @@ -151,6 +155,7 @@ def parse_args(): action='store_true', default=False, required=False) + parser.add_argument('--verbose', help='Mooooorreee logs') return parser.parse_args()