From 34ac68c4a84c477ad86e64139c37122794198ca4 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@github.com>
Date: Tue, 22 Jan 2019 16:14:01 -0500
Subject: [PATCH] ci: Update build timeouts (#16492)

* Update timeout for native_mksnapshot and use bigger machines

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

This reverts commit 51961fccfa58ae84c33dbfb54146ffc0ef08e35c.
---
 .circleci/config.yml       |  9 ++++-----
 script/ci-release-build.js | 22 +++++++++-------------
 script/release.js          | 14 ++++++--------
 3 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f0cc7fb08570..a29d5d04f09a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -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
   run:
     name: Native mksnapshot build (arm/arm64)
+    no_output_timeout: 30m
     command: |
       if [ "$BUILD_NATIVE_MKSNAPSHOT" == "1" ]; then
         cd src
-        # NOTE(jeremy): -j3 because mksnapshot is currently built on a smaller
-        # machine size and ninja mis-detects the number of CPUs available.
-        ninja -C out/native_mksnapshot electron:electron_mksnapshot_zip -j3
+        ninja -C out/native_mksnapshot electron:electron_mksnapshot_zip -j18
       else
         echo 'Skipping native mksnapshot build for non arm build'
       fi
@@ -928,7 +927,7 @@ jobs:
     <<: *steps-electron-build-for-publish
 
   linux-arm-native-mksnapshot:
-    <<: *machine-linux-medium
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-arm
       <<: *env-release-build
@@ -988,7 +987,7 @@ jobs:
     <<: *steps-electron-build-for-publish
 
   linux-arm64-native-mksnapshot:
-    <<: *machine-linux-medium
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-arm64
       <<: *env-release-build
diff --git a/script/ci-release-build.js b/script/ci-release-build.js
index 5ad2d09c14e1..e2cee5fb63c6 100644
--- a/script/ci-release-build.js
+++ b/script/ci-release-build.js
@@ -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.`)
diff --git a/script/release.js b/script/release.js
index 591f9db849e0..7f9605c32c90 100755
--- a/script/release.js
+++ b/script/release.js
@@ -95,11 +95,10 @@ function assetsForVersion (version, validatingRelease) {
     `electron-${version}-darwin-x64-dsym.zip`,
     `electron-${version}-darwin-x64-symbols.zip`,
     `electron-${version}-darwin-x64.zip`,
-    // FIXME(codebytere): re-enable
-    // `electron-${version}-linux-arm64-symbols.zip`,
-    // `electron-${version}-linux-arm64.zip`,
-    // `electron-${version}-linux-armv7l-symbols.zip`,
-    // `electron-${version}-linux-armv7l.zip`,
+    `electron-${version}-linux-arm64-symbols.zip`,
+    `electron-${version}-linux-arm64.zip`,
+    `electron-${version}-linux-armv7l-symbols.zip`,
+    `electron-${version}-linux-armv7l.zip`,
     `electron-${version}-linux-ia32-symbols.zip`,
     `electron-${version}-linux-ia32.zip`,
     `electron-${version}-linux-x64-symbols.zip`,
@@ -116,9 +115,8 @@ function assetsForVersion (version, validatingRelease) {
     `electron-api.json`,
     `electron.d.ts`,
     `ffmpeg-${version}-darwin-x64.zip`,
-    // FIXME(codebytere): re-enable
-    // `ffmpeg-${version}-linux-arm64.zip`,
-    // `ffmpeg-${version}-linux-armv7l.zip`,
+    `ffmpeg-${version}-linux-arm64.zip`,
+    `ffmpeg-${version}-linux-armv7l.zip`,
     `ffmpeg-${version}-linux-ia32.zip`,
     `ffmpeg-${version}-linux-x64.zip`,
     `ffmpeg-${version}-mas-x64.zip`,