From 470a44fe0e0dcce77991eae2af433138833aacb4 Mon Sep 17 00:00:00 2001 From: John Kleinschmidt Date: Thu, 17 Nov 2022 17:49:12 -0500 Subject: [PATCH] fix: remove unneeded --turbo-profiling-input arg from mksnapshot_args (#36378) fix: remove unneeded --turbo-profiling-input args from mksnapshot_args (cherry picked from commit 7529ebfe0e20ff0456aaab29c22346e35cf074ce) --- .circleci/config/base.yml | 16 ++++++++++++++++ appveyor.yml | 11 ++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml index fafb8818978e5..b258a0deef78e 100644 --- a/.circleci/config/base.yml +++ b/.circleci/config/base.yml @@ -574,6 +574,13 @@ step-electron-build: &step-electron-build ninja -C out/Default electron:electron_mksnapshot_zip -j $NUMBER_OF_NINJA_PROCESSES ninja -C out/Default tools/v8_context_snapshot -j $NUMBER_OF_NINJA_PROCESSES gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args + # Remove unused args from mksnapshot_args + SEDOPTION= + if [ "`uname`" == "Darwin" ]; then + SEDOPTION="-i ''" + fi + sed $SEDOPTION '/.*builtins-pgo/d' out/Default/mksnapshot_args + sed $SEDOPTION '/--turbo-profiling-input/d' out/Default/mksnapshot_args (cd out/Default; zip mksnapshot.zip mksnapshot_args clang_x64_v8_arm64/gen/v8/embedded.S) rm -rf out/Default/clang_x64_v8_arm64/gen rm -rf out/Default/clang_x64_v8_arm64/obj @@ -764,6 +771,13 @@ step-mksnapshot-build: &step-mksnapshot-build if [ "$USE_PREBUILT_V8_CONTEXT_SNAPSHOT" != "1" ]; then ninja -C out/Default electron:electron_mksnapshot -j $NUMBER_OF_NINJA_PROCESSES gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args + # Remove unused args from mksnapshot_args + SEDOPTION= + if [ "`uname`" == "Darwin" ]; then + SEDOPTION="-i ''" + fi + sed $SEDOPTION '/.*builtins-pgo/d' out/Default/mksnapshot_args + sed $SEDOPTION '/--turbo-profiling-input/d' out/Default/mksnapshot_args fi if [ "`uname`" != "Darwin" ]; then if [ "$TARGET_ARCH" == "arm" ]; then @@ -2194,3 +2208,5 @@ workflows: lint: jobs: - lint + +# VS Code Extension Version: 1.1.1 \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 8d6eed2b94313..24032b3141630 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -179,7 +179,11 @@ for: - ninja -C out/ffmpeg electron:electron_ffmpeg_zip - ninja -C out/Default electron:electron_dist_zip - ninja -C out/Default shell_browser_ui_unittests - - gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args + - gn desc out/Default v8:run_mksnapshot_default args > out/Default/default_mksnapshot_args + - ps: >- + # Remove unused args from mksnapshot_args + + Get-Content out/Default/default_mksnapshot_args | Where-Object { -not $_.Contains('--turbo-profiling-input') -And -not $_.Contains('builtins-pgo') } | Set-Content out/Default/mksnapshot_args - ninja -C out/Default electron:electron_mksnapshot_zip - cd out\Default - 7z a mksnapshot.zip mksnapshot_args gen\v8\embedded.S @@ -190,7 +194,6 @@ for: - python %LOCAL_GOMA_DIR%\goma_ctl.py stat - python3 electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json - 7z a node_headers.zip out\Default\gen\node_headers - - 7z a builtins-pgo.zip v8\tools\builtins-pgo - ps: >- if ($env:GN_CONFIG -eq 'release') { # Needed for msdia140.dll on 64-bit windows @@ -235,7 +238,6 @@ for: - if exist out\Default\mksnapshot.zip (appveyor-retry appveyor PushArtifact out\Default\mksnapshot.zip) - if exist out\Default\hunspell_dictionaries.zip (appveyor-retry appveyor PushArtifact out\Default\hunspell_dictionaries.zip) - if exist out\Default\electron.lib (appveyor-retry appveyor PushArtifact out\Default\electron.lib) - - if exist builtins-pgo.zip (appveyor-retry appveyor PushArtifact builtins-pgo.zip) - ps: >- if ((Test-Path "pdb.zip") -And ($env:GN_CONFIG -ne 'release')) { appveyor-retry appveyor PushArtifact pdb.zip @@ -269,7 +271,7 @@ for: # Download build artifacts $apiUrl = 'https://ci.appveyor.com/api' $build_info = Invoke-RestMethod -Method Get -Uri "$apiUrl/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/builds/$env:APPVEYOR_BUILD_ID" - $artifacts_to_download = @('dist.zip','shell_browser_ui_unittests.exe','chromedriver.zip','ffmpeg.zip','node_headers.zip','mksnapshot.zip','electron.lib','builtins-pgo.zip') + $artifacts_to_download = @('dist.zip','shell_browser_ui_unittests.exe','chromedriver.zip','ffmpeg.zip','node_headers.zip','mksnapshot.zip','electron.lib') foreach ($job in $build_info.build.jobs) { if ($job.name -eq "Build") { $jobId = $job.jobId @@ -290,7 +292,6 @@ for: } - ps: 7z x -y -osrc\out\ffmpeg ffmpeg.zip - ps: 7z x -y -osrc node_headers.zip - - ps: 7z x -y -osrc builtins-pgo.zip test_script: # Workaround for https://github.com/appveyor/ci/issues/2420