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

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
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.circleci/config.yml
View file

@ -376,12 +376,11 @@ step-maybe-native-mksnapshot-gn-gen: &step-maybe-native-mksnapshot-gn-gen
step-maybe-native-mksnapshot-build: &step-maybe-native-mksnapshot-build step-maybe-native-mksnapshot-build: &step-maybe-native-mksnapshot-build
run: run:
name: Native mksnapshot build (arm/arm64) name: Native mksnapshot build (arm/arm64)
no_output_timeout: 30m
command: | command: |
if [ "$BUILD_NATIVE_MKSNAPSHOT" == "1" ]; then if [ "$BUILD_NATIVE_MKSNAPSHOT" == "1" ]; then
cd src cd src
# NOTE(jeremy): -j3 because mksnapshot is currently built on a smaller ninja -C out/native_mksnapshot electron:electron_mksnapshot_zip -j18
# machine size and ninja mis-detects the number of CPUs available.
ninja -C out/native_mksnapshot electron:electron_mksnapshot_zip -j3
else else
echo 'Skipping native mksnapshot build for non arm build' echo 'Skipping native mksnapshot build for non arm build'
fi fi
@ -928,7 +927,7 @@ jobs:
<<: *steps-electron-build-for-publish <<: *steps-electron-build-for-publish
linux-arm-native-mksnapshot: linux-arm-native-mksnapshot:
<<: *machine-linux-medium <<: *machine-linux-2xlarge
environment: environment:
<<: *env-arm <<: *env-arm
<<: *env-release-build <<: *env-release-build
@ -988,7 +987,7 @@ jobs:
<<: *steps-electron-build-for-publish <<: *steps-electron-build-for-publish
linux-arm64-native-mksnapshot: linux-arm64-native-mksnapshot:
<<: *machine-linux-medium <<: *machine-linux-2xlarge
environment: environment:
<<: *env-arm64 <<: *env-arm64
<<: *env-release-build <<: *env-release-build

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

@ -11,9 +11,8 @@ const appVeyorJobs = {
} }
const circleCIJobs = [ const circleCIJobs = [
// FIXME(codebytere): re-enable 'linux-arm-publish',
// 'linux-arm-publish', 'linux-arm64-publish',
// 'linux-arm64-publish',
'linux-ia32-publish', 'linux-ia32-publish',
'linux-x64-publish' 'linux-x64-publish'
] ]
@ -23,11 +22,10 @@ const vstsJobs = [
'electron-release-osx-x64' 'electron-release-osx-x64'
] ]
// FIXME(codebytere): re-enable const vstsArmJobs = [
// const vstsArmJobs = [ 'electron-arm-testing',
// 'electron-arm-testing', 'electron-arm64-testing'
// 'electron-arm64-testing' ]
// ]
async function makeRequest (requestOptions, parseResponse) { async function makeRequest (requestOptions, parseResponse) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@ -136,11 +134,9 @@ function buildCircleCI (targetBranch, options) {
} }
async function buildVSTS (targetBranch, options) { async function buildVSTS (targetBranch, options) {
// FIXME(codebytere): re-enable 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) {
// }
if (options.job) {
assert(vstsJobs.includes(options.job), `Unknown VSTS CI job name: ${options.job}. Valid values are: ${vstsJobs}.`) 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.`)

14
script/release.js
View file

@ -95,11 +95,10 @@ function assetsForVersion (version, validatingRelease) {
`electron-${version}-darwin-x64-dsym.zip`, `electron-${version}-darwin-x64-dsym.zip`,
`electron-${version}-darwin-x64-symbols.zip`, `electron-${version}-darwin-x64-symbols.zip`,
`electron-${version}-darwin-x64.zip`, `electron-${version}-darwin-x64.zip`,
// FIXME(codebytere): re-enable `electron-${version}-linux-arm64-symbols.zip`,
// `electron-${version}-linux-arm64-symbols.zip`, `electron-${version}-linux-arm64.zip`,
// `electron-${version}-linux-arm64.zip`, `electron-${version}-linux-armv7l-symbols.zip`,
// `electron-${version}-linux-armv7l-symbols.zip`, `electron-${version}-linux-armv7l.zip`,
// `electron-${version}-linux-armv7l.zip`,
`electron-${version}-linux-ia32-symbols.zip`, `electron-${version}-linux-ia32-symbols.zip`,
`electron-${version}-linux-ia32.zip`, `electron-${version}-linux-ia32.zip`,
`electron-${version}-linux-x64-symbols.zip`, `electron-${version}-linux-x64-symbols.zip`,
@ -116,9 +115,8 @@ function assetsForVersion (version, validatingRelease) {
`electron-api.json`, `electron-api.json`,
`electron.d.ts`, `electron.d.ts`,
`ffmpeg-${version}-darwin-x64.zip`, `ffmpeg-${version}-darwin-x64.zip`,
// FIXME(codebytere): re-enable `ffmpeg-${version}-linux-arm64.zip`,
// `ffmpeg-${version}-linux-arm64.zip`, `ffmpeg-${version}-linux-armv7l.zip`,
// `ffmpeg-${version}-linux-armv7l.zip`,
`ffmpeg-${version}-linux-ia32.zip`, `ffmpeg-${version}-linux-ia32.zip`,
`ffmpeg-${version}-linux-x64.zip`, `ffmpeg-${version}-linux-x64.zip`,
`ffmpeg-${version}-mas-x64.zip`, `ffmpeg-${version}-mas-x64.zip`,