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

build: remove non-arm vstsJobs (#16793)

Browse source
This commit is contained in:
Shelley Vohr 2019-02-06 13:36:17 -08:00 • committed by Samuel Attard
parent 17c240a639
commit a569dad8c5
1 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,11 +19,6 @@ const circleCIJobs = [
'osx-publish' 'osx-publish'
] ]
const vstsJobs = [
'electron-release-mas-x64',
'electron-release-osx-x64'
]
const vstsArmJobs = [ const vstsArmJobs = [
'electron-arm-testing', 'electron-arm-testing',
'electron-arm64-testing' 'electron-arm64-testing'
@ -138,9 +133,8 @@ function buildCircleCI (targetBranch, options) {
async function buildVSTS (targetBranch, options) { async function buildVSTS (targetBranch, options) {
if (options.armTest) { if (options.armTest) {
assert(vstsArmJobs.includes(options.job), `Unknown VSTS CI arm test job name: ${options.job}. Valid values are: ${vstsArmJobs}.`) 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.`) console.log(`Triggering VSTS to run build on branch: ${targetBranch} with release flag.`)
const environmentVariables = { const environmentVariables = {
ELECTRON_RELEASE: 1 ELECTRON_RELEASE: 1
@ -167,12 +161,7 @@ async function buildVSTS (targetBranch, options) {
const vstsResponse = await makeRequest(requestOpts, true).catch(err => { const vstsResponse = await makeRequest(requestOpts, true).catch(err => {
console.log('Error calling VSTS to get build definitions:', err) console.log('Error calling VSTS to get build definitions:', err)
}) })
let buildsToRun = [] const buildsToRun = vstsResponse.value.filter(build => build.name === options.job)
if (options.job) {
buildsToRun = vstsResponse.value.filter(build => build.name === options.job)
} else {
buildsToRun = vstsResponse.value.filter(build => vstsJobs.includes(build.name))
}
buildsToRun.forEach((build) => callVSTSBuild(build, targetBranch, environmentVariables)) buildsToRun.forEach((build) => callVSTSBuild(build, targetBranch, environmentVariables))
} }