mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ci: use smaller vms for testing since we are using goma (#22887)

Browse source
This commit is contained in:
John Kleinschmidt 2020-03-30 15:46:42 -04:00 committed by GitHub
parent 98e5836eb6
commit be5511393b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
.circleci/config.yml
View file

@ -67,6 +67,10 @@ machine-linux-medium: &machine-linux-medium
<<: *docker-image <<: *docker-image
resource_class: medium resource_class: medium
machine-linux-xlarge: &machine-linux-xlarge
<<: *docker-image
resource_class: xlarge
machine-linux-2xlarge: &machine-linux-2xlarge machine-linux-2xlarge: &machine-linux-2xlarge
<<: *docker-image <<: *docker-image
resource_class: 2xlarge+ resource_class: 2xlarge+
@ -1621,9 +1625,9 @@ jobs:
# Layer 2: Builds. # Layer 2: Builds.
linux-x64-testing: linux-x64-testing:
<<: *machine-linux-2xlarge <<: *machine-linux-xlarge
environment: environment:
<<: *env-linux-2xlarge <<: *env-global
<<: *env-testing-build <<: *env-testing-build
<<: *env-ninja-status <<: *env-ninja-status
GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True' GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
@ -1701,9 +1705,9 @@ jobs:
checkout: false checkout: false
linux-ia32-testing: linux-ia32-testing:
<<: *machine-linux-2xlarge <<: *machine-linux-xlarge
environment: environment:
<<: *env-linux-2xlarge <<: *env-global
<<: *env-ia32 <<: *env-ia32
<<: *env-testing-build <<: *env-testing-build
<<: *env-ninja-status <<: *env-ninja-status
@ -1767,9 +1771,9 @@ jobs:
checkout: false checkout: false
linux-arm-testing: linux-arm-testing:
<<: *machine-linux-2xlarge <<: *machine-linux-xlarge
environment: environment:
<<: *env-linux-2xlarge <<: *env-global
<<: *env-arm <<: *env-arm
<<: *env-testing-build <<: *env-testing-build
<<: *env-ninja-status <<: *env-ninja-status
@ -1834,9 +1838,9 @@ jobs:
checkout: false checkout: false
linux-arm64-testing: linux-arm64-testing:
<<: *machine-linux-2xlarge <<: *machine-linux-xlarge
environment: environment:
<<: *env-linux-2xlarge <<: *env-global
<<: *env-arm64 <<: *env-arm64
<<: *env-testing-build <<: *env-testing-build
<<: *env-ninja-status <<: *env-ninja-status

2
appveyor.yml
View file

@ -28,7 +28,7 @@
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
version: 1.0.{build} version: 1.0.{build}
build_cloud: libcc-20 build_cloud: electron-16-core
image: vs2019bt-16.4.0 image: vs2019bt-16.4.0
environment: environment:
GIT_CACHE_PATH: C:\Users\electron\libcc_cache GIT_CACHE_PATH: C:\Users\electron\libcc_cache

3
script/release/ci-release-build.js
View file

@ -206,7 +206,8 @@ function buildAppVeyor (targetBranch, options) {
async function callAppVeyor (targetBranch, job, options) { async function callAppVeyor (targetBranch, job, options) {
console.log(`Triggering AppVeyor to run build job: ${job} on branch: ${targetBranch} with release flag.`); console.log(`Triggering AppVeyor to run build job: ${job} on branch: ${targetBranch} with release flag.`);
const environmentVariables = { const environmentVariables = {
ELECTRON_RELEASE: 1 ELECTRON_RELEASE: 1,
APPVEYOR_BUILD_WORKER_CLOUD: 'libcc-20'
}; };
if (!options.ghRelease) { if (!options.ghRelease) {