Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1cac941

Browse files
authored
ci: update appveyor image (23-x-y) (#37226)
ci update appveyor image(cherry picked from commit454dc6a)
1 parentf99c175 commit1cac941

File tree

4 files changed

+70
-29
lines changed

4 files changed

+70
-29
lines changed

‎appveyor-bake.yml‎

Lines changed: 64 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
version:1.0.{build}
88
build_cloud:electronhq-16-core
9-
image:e-110.0.5451.0
9+
image:e-110.0.5481.77
1010
environment:
1111
GIT_CACHE_PATH:C:\Users\appveyor\libcc_cache
1212
ELECTRON_OUT_DIR:Default
@@ -16,22 +16,58 @@ environment:
1616
GOMA_FALLBACK_ON_AUTH_FAILURE:true
1717
DEPOT_TOOLS_WIN_TOOLCHAIN:0
1818
PYTHONIOENCODING:UTF-8
19-
# Uncomment these lines and set APPVEYOR_RDP_PASSWORD in project settings to enable RDP before bake begins
20-
# install:
21-
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
19+
20+
# The following lines are needed when baking from a completely new image (eg MicrosoftWindowsServer:WindowsServer:2019-Datacenter:latest via image: base-windows-server2019)
21+
# init:
22+
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
23+
# - appveyor version
24+
# - ps: $ErrorActionPreference = 'Stop'
25+
# - ps: 'Write-Host "OS Build: $((Get-CimInstance Win32_OperatingSystem).BuildNumber)"'
26+
27+
# clone_folder: '%USERPROFILE%\image-bake-scripts'
28+
29+
# clone_script:
30+
# - ps: Invoke-WebRequest "https://github.com/appveyor/build-images/archive/1f90d94e74c8243c909a09b994e527584dfcb838.zip" -OutFile "$env:temp\scripts.zip"
31+
# - ps: Expand-Archive -Path "$env:temp\scripts.zip" -DestinationPath "$env:temp\scripts" -Force
32+
# - ps: Copy-Item -Path "$env:temp\scripts\build-images-1f90d94e74c8243c909a09b994e527584dfcb838\scripts\Windows\*" -Destination $env:APPVEYOR_BUILD_FOLDER -Recurse
33+
2234
build_script:
23-
# Uncomment/change the following line if the hard drive/partition size needs to change
24-
# - ps: Resize-Partition -DriveLetter C -Size (256GB) # ensure initial partition size
35+
# The following lines are needed when baking from a completely new image (eg MicrosoftWindowsServer:WindowsServer:2019-Datacenter:latest via image: base-windows-server2019)
36+
# - ps: .\init_server.ps1
37+
# - ps: .\extend_system_volume.ps1
38+
39+
# # Restart VM
40+
# - ps: Start-Sleep -s 5; Restart-Computer
41+
# - ps: Start-Sleep -s 5
42+
43+
# - appveyor version
44+
# - ps: .\install_path_utils.ps1
45+
# - ps: .\install_powershell_core.ps1
46+
# - ps: .\install_powershell_get.ps1
47+
# - ps: .\install_7zip.ps1
48+
# - ps: .\install_chocolatey.ps1
49+
# - ps: .\install_webpi.ps1
50+
# - ps: .\install_nuget.ps1
51+
# - ps: .\install_pstools.ps1
52+
53+
# - ps: .\install_git.ps1
54+
# - ps: .\install_git_lfs.ps1
55+
56+
# # Restart VM
57+
# - ps: Start-Sleep -s 5; Restart-Computer
58+
# - ps: Start-Sleep -s 5
59+
# END LINES FOR COMPLETELY NEW IMAGE
60+
2561
-git config --global core.longpaths true
26-
-cd ..
2762
-ps:>-
28-
if (-not (Test-Path -Path.\src)) {
29-
New-Item -Path.\src -ItemType Directory
63+
if (-not (Test-Path -PathC:\projects\src)) {
64+
New-Item -PathC:\projects\src -ItemType Directory
3065
}
31-
-ps:git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
32-
-ps:$env:PATH="$pwd\depot_tools;$env:PATH"
66+
-cd C:\projects\
67+
-git clone -q --branch=%APPVEYOR_REPO_BRANCH% https://github.com/electron/electron.git C:\projects\src\electron
68+
-git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
69+
-ps:$env:PATH="$pwd\depot_tools;$env:PATH"
3370
-update_depot_tools.bat
34-
-ps:Move-Item $env:APPVEYOR_BUILD_FOLDER -Destination src\electron
3571
# Uncomment the following line if windows deps change
3672
# - src\electron\script\setup-win-for-dev.bat
3773
->-
@@ -47,20 +83,25 @@ build_script:
4783
-ps:cd ..\..
4884
-gclient sync --with_branch_heads --with_tags --nohooks
4985
-ps:regsvr32 /s "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\DIA SDK\bin\amd64\msdia140.dll"
50-
-ps:|
51-
$env:appveyor_user = "appveyor"
52-
53-
$env:appveyor_password = [Guid]::NewGuid().ToString('B')
5486

55-
Set-LocalUser -Name $env:appveyor_user -Password (ConvertTo-SecureString -AsPlainText $env:appveyor_password -Force) -PasswordNeverExpires:$true
87+
# The following lines are needed when baking from a completely new image (eg MicrosoftWindowsServer:WindowsServer:2019-Datacenter:latest via image: base-windows-server2019)
88+
# # Restart VM
89+
# - ps: Start-Sleep -s 5; Restart-Computer
90+
# - ps: Start-Sleep -s 5
5691

57-
iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/build-images/master/scripts/Windows/enable_autologon.ps1'))
92+
# - cd %USERPROFILE%\image-bake-scripts
93+
# - appveyor version
94+
# - ps: .\optimize_dotnet_runtime.ps1
95+
# - ps: .\disable_windows_background_services.ps1
96+
# - ps: .\enforce_windows_firewall.ps1
97+
# - ps: .\cleanup_windows.ps1
98+
# END LINES FOR COMPLETELY NEW IMAGE
5899
on_image_bake:
59100
-ps:>-
60101
echo "Baking image: $env:APPVEYOR_BAKE_IMAGE at dir $PWD"
61-
-ps:Remove-Item -Recurse -Force$pwd\depot_tools
62-
-ps:Remove-Item -Recurse -Force$pwd\src\electron
102+
-ps:Remove-Item -Recurse -ForceC:\projects\depot_tools
103+
-ps:Remove-Item -Recurse -ForceC:\projects\src\electron
63104
# Uncomment these lines and set APPVEYOR_RDP_PASSWORD in project settings to enable RDP after bake is done
64-
#on_finish:
65-
# - ps: >-
66-
# $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
105+
# #on_finish:
106+
#- ps: >-
107+
#$blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

‎appveyor-woa.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
version:1.0.{build}
3131
build_cloud:electronhq-16-core
32-
image:e-110.0.5478.5
32+
image:e-110.0.5481.77
3333
environment:
3434
GIT_CACHE_PATH:C:\Users\appveyor\libcc_cache
3535
ELECTRON_OUT_DIR:Default
@@ -82,7 +82,7 @@ for:
8282
if (Test-Path -Path "$pwd\build-tools") {
8383
Remove-Item -Recurse -Force $pwd\build-tools
8484
}
85-
-ps:git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
85+
-git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
8686
-ps:$env:PATH="$pwd\depot_tools;$env:PATH"
8787
-ps:>-
8888
if (Test-Path -Path "$pwd\src\electron") {

‎appveyor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
version:1.0.{build}
3131
build_cloud:electronhq-16-core
32-
image:e-110.0.5478.5
32+
image:e-110.0.5481.77
3333
environment:
3434
GIT_CACHE_PATH:C:\Users\appveyor\libcc_cache
3535
ELECTRON_OUT_DIR:Default
@@ -80,7 +80,7 @@ for:
8080
if (Test-Path -Path "$pwd\build-tools") {
8181
Remove-Item -Recurse -Force $pwd\build-tools
8282
}
83-
-ps:git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
83+
-git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
8484
-ps:$env:PATH="$pwd\depot_tools;$env:PATH"
8585
-ps:>-
8686
if (Test-Path -Path "$pwd\src\electron") {

‎script/prepare-appveyor.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ const ROLLER_BRANCH_PATTERN = /^roller\/chromium$/;
1414

1515
constDEFAULT_BUILD_CLOUD_ID='1598';
1616
constDEFAULT_BUILD_CLOUD='electronhq-16-core';
17-
constDEFAULT_BAKE_BASE_IMAGE='e-110.0.5451.0';
18-
constDEFAULT_BUILD_IMAGE='e-110.0.5451.0';
17+
constDEFAULT_BAKE_BASE_IMAGE='e-111.0.5560.0-2';
18+
constDEFAULT_BUILD_IMAGE='e-111.0.5560.0-2';
1919

2020
constappveyorBakeJob='electron-bake-image';
2121
constappVeyorJobs={

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp