From 7e8607fd7a3dac522fce600a3e5fd03bda64efff Mon Sep 17 00:00:00 2001 From: Keeley Hammond Date: Wed, 24 Aug 2022 19:11:44 -0600 Subject: [PATCH] ci: fix appveyor x64 tests (#35406) * ci: fix appveyor x64 tests * extract builtins-pgo to correct directory Co-authored-by: John Kleinschmidt --- appveyor.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 0bd7f8d8a80d..06bdb45f9858 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -190,6 +190,7 @@ 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 @@ -234,6 +235,7 @@ 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 @@ -267,7 +269,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') + $artifacts_to_download = @('dist.zip','shell_browser_ui_unittests.exe','chromedriver.zip','ffmpeg.zip','node_headers.zip','mksnapshot.zip','electron.lib','builtins-pgo.zip') foreach ($job in $build_info.build.jobs) { if ($job.name -eq "Build") { $jobId = $job.jobId @@ -288,6 +290,7 @@ 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