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

ci: Update build timeouts (#16492)

Browse source 
* Update timeout for native_mksnapshot and use bigger machines

* Revert "build: temporarily disable arm to unblock nightlies (#16479)"

This reverts commit 51961fccfa.
This commit is contained in:
John Kleinschmidt 2019-01-22 16:14:01 -05:00 • committed by GitHub
parent f3e30c7ae3
commit 34ac68c4a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,9 +11,8 @@ const appVeyorJobs = {
}
const circleCIJobs = [
// FIXME(codebytere): re-enable
// 'linux-arm-publish',
// 'linux-arm64-publish',
'linux-arm-publish',
'linux-arm64-publish',
'linux-ia32-publish',
'linux-x64-publish'
]
@ -23,11 +22,10 @@ const vstsJobs = [
'electron-release-osx-x64'
]
// FIXME(codebytere): re-enable
// const vstsArmJobs = [
// 'electron-arm-testing',
// 'electron-arm64-testing'
// ]
const vstsArmJobs = [
'electron-arm-testing',
'electron-arm64-testing'
]
async function makeRequest (requestOptions, parseResponse) {
return new Promise((resolve, reject) => {
@ -136,11 +134,9 @@ function buildCircleCI (targetBranch, options) {
}
async function buildVSTS (targetBranch, options) {
// FIXME(codebytere): re-enable
// if (options.armTest) {
// assert(vstsArmJobs.includes(options.job), `Unknown VSTS CI arm test job name: ${options.job}. Valid values are: ${vstsArmJobs}.`)
// }
if (options.job) {
if (options.armTest) {
assert(vstsArmJobs.includes(options.job), `Unknown VSTS CI arm test job name: ${options.job}. Valid values are: ${vstsArmJobs}.`)
} else if (options.job) {
assert(vstsJobs.includes(options.job), `Unknown VSTS CI job name: ${options.job}. Valid values are: ${vstsJobs}.`)
}
console.log(`Triggering VSTS to run build on branch: ${targetBranch} with release flag.`)