diff --git a/appveyor-bake.yml b/appveyor-bake.yml index fbee3f1ad4..f2f40b8647 100644 --- a/appveyor-bake.yml +++ b/appveyor-bake.yml @@ -6,7 +6,7 @@ version: 1.0.{build} build_cloud: electronhq-16-core -image: e-111.0.5560.0-2 +image: e-111.0.5560.0-node18 environment: GIT_CACHE_PATH: C:\Users\appveyor\libcc_cache ELECTRON_OUT_DIR: Default diff --git a/appveyor.yml b/appveyor.yml index 7172c63f2b..57a550769c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,7 +29,7 @@ version: 1.0.{build} build_cloud: electronhq-16-core -image: e-111.0.5560.0-2 +image: e-111.0.5560.0-node18 environment: GIT_CACHE_PATH: C:\Users\appveyor\libcc_cache ELECTRON_OUT_DIR: Default diff --git a/script/prepare-appveyor.js b/script/prepare-appveyor.js index 210aec54c7..aef5261903 100644 --- a/script/prepare-appveyor.js +++ b/script/prepare-appveyor.js @@ -14,8 +14,8 @@ const ROLLER_BRANCH_PATTERN = /^roller\/chromium$/; const DEFAULT_BUILD_CLOUD_ID = '1598'; const DEFAULT_BUILD_CLOUD = 'electronhq-16-core'; -const DEFAULT_BAKE_BASE_IMAGE = 'e-111.0.5560.0-2'; -const DEFAULT_BUILD_IMAGE = 'e-111.0.5560.0-2'; +const DEFAULT_BAKE_BASE_IMAGE = 'e-111.0.5560.0-node18'; +const DEFAULT_BUILD_IMAGE = 'e-111.0.5560.0-node18'; const appveyorBakeJob = 'electron-bake-image'; const appVeyorJobs = { diff --git a/script/setup-win-for-dev.bat b/script/setup-win-for-dev.bat index 2b5fb9a2ea..c1a050f0dc 100644 --- a/script/setup-win-for-dev.bat +++ b/script/setup-win-for-dev.bat @@ -56,7 +56,8 @@ REM Install Windows SDK choco install windows-sdk-10-version-2104-all REM Install nodejs python git and yarn needed dependencies -choco install -y nodejs-lts python2 git yarn +choco install -y --force nodejs@v18.12.1 +choco install -y python2 git yarn choco install python --version 3.7.9 call C:\ProgramData\chocolatey\bin\RefreshEnv.cmd SET PATH=C:\Python27\;C:\Python27\Scripts;C:\Python39\;C:\Python39\Scripts;%PATH%