try out time again

CHANGELOG.md

@@ -5,46 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-
-## [0.8.5] - 2019-06-19
-### Added
-- Added support for Android build modes: debug or release.
-### Fixed
-- Upgrading the shell app for a given SDK version when the previous version is already downloaded (bug in `turtle-cli`).
-- Updated Android shell app for SDK33 to include `[email protected]` which fixes crashes on Android 9.0 when showing some Lottie animations.
-- Schema for `buildModes`.
-- Updated @expo/xdl to 55.0.7 (fixed reading from binary plist).
-
-## [0.8.4] - 2019-06-13
-### Changed
-- Upgraded `sharp` from `0.21.3` to `0.22.1`.
-- `gulp-cli` is no longer required to build an app with `turtle-cli`.
-
-## [0.8.3] - 2019-06-13
-### Added
-- Running Android Turtle process with `supervisor` (pod is restarted if there were 5 failures in the last 10 minutes).
-### Changed
-- `turtle-cli` is now fetching the app manifest before running the build.
-
-## [0.8.2] - 2019-06-11
-### Changed
-- Updated Android shell app for SDK33 to remove `expo-face-detector` and `expo-payments-stripe` from standalone builds.
-- Updated Android shell app for SDK33 to get rid of `node_modules` for `tools-public`.
-- From now on, `turtle-cli` installs dependencies for `tools-public` in shell apps for SDK versions < 33.
-### Fixed
-- Android builds with turtle-cli by installing all unmodules if `dependencies` is empty.
-
-## [0.8.1] - 2019-06-10
-### Changed
-- Add expo dependencies when resolving unimodules.
-### Fixed
-- Support for Android tarballs without `universe-package.json`.
-
-## [0.8.0] - 2019-06-07
 ### Added
 - Turtle CLI logo to the project (created by [@zularizal](https://github.com/zularizal))!
-- Shell apps for SDK 33.
-- Support for Android App Bundles (App bundles are built by default, use `-t apk` to build apk).
+- Added shell apps for SDK 33.
+- Support for Android App Bundles
 ### Changed
 - Updated Android shell app for SDK 32 to fix AppAuth issue (https://github.com/expo/expo/pull/4115) and to fix a newer than expected JSC version.
 - Default value for build timeout to 15 minutes.
@@ -54,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Generating Android keystore in turtle when one is not passed to turtle-cli (https://github.com/expo/turtle/pull/65).
 - Upload logs to s3 if build has been canceled or timed out.
 - Unhandled exception on asset download (xdl).
+- Fixed support for Android tarballs without `universe-package.json`.
 
 ## [0.7.2] - 2019-05-09
 ### Added

Dockerfile

@@ -21,10 +21,10 @@ RUN dpkg --add-architecture i386 && \
   libncurses5:i386\
   libstdc++6:i386\
   rsync\
+  time\
   unzip\
   yarn\
   zlib1g:i386\
-  supervisor\
   --no-install-recommends && \
   apt-get clean
 
@@ -52,8 +52,20 @@ ENV PATH ${ANDROID_HOME}/tools:${PATH}
 ENV PATH ${ANDROID_HOME}/tools/bin:${PATH}
 ENV PATH ${ANDROID_HOME}/build-tools/28.0.3/:${PATH}
 
-ADD scripts/android/configureAndroidSdk.sh /tmp/configureAndroidSdk.sh
-RUN /tmp/configureAndroidSdk.sh --install-all-platforms
+RUN yes | sdkmanager --licenses > /dev/null
+RUN yes | sdkmanager \
+  "platforms;android-23" \
+  "platforms;android-24" \
+  "platforms;android-25" \
+  "platforms;android-26" \
+  "platforms;android-27" \
+  "platforms;android-28" | grep -v '=' || echo 'no output'
+RUN yes | sdkmanager "platform-tools" | grep -v '=' || echo 'no output'
+RUN yes | sdkmanager "build-tools;28.0.3" | grep -v '=' || echo 'no output'
+RUN yes | sdkmanager \
+  "extras;android;m2repository" \
+  "extras;google;m2repository" \
+  "extras;google;google_play_services" | grep -v '=' || echo 'no output'
 
 # Install Android NDK
 ENV ANDROID_NDK_VERSION android-ndk-r10e
@@ -105,13 +117,11 @@ RUN mv /app/turtle/workingdir /app && \
       yarn install; \
       fi \
     ; done && \
-    mv /app/workingdir /app/turtle
+    time mv /app/workingdir /app/turtle
 
 ENV NODE_ENV "production"
 ENV TURTLE_WORKING_DIR_PATH /app/turtle/workingdir/
 
 WORKDIR /app/turtle
 
-ADD supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-
-CMD ["/usr/bin/supervisord"]
+CMD ["node", "./build/server.js"]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "turtle-cli",
-  "version": "0.8.6",
+  "version": "0.8.0",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {
@@ -13,7 +13,6 @@
     "prepare": "rimraf ./build && yarn build",
     "build": "ttsc",
     "build:production": "./scripts/build.sh",
-    "watch": "ttsc --watch",
     "secrets:init-private": "./scripts/initPrivateSecrets.sh",
     "set-workingdir:remote": "./scripts/setWorkingdirMode.sh remote",
     "set-workingdir:local": "./scripts/setWorkingdirMode.sh local",
@@ -60,7 +59,7 @@
   "files": [
     "bin",
     "build",
-    "scripts/android/configureAndroidSdk.sh",
+    "scripts/cli",
     "shellTarballs"
   ],
   "keywords": [
@@ -111,7 +110,7 @@
   },
   "dependencies": {
     "@expo/spawn-async": "^1.4.2",
-    "@expo/xdl": "55.0.7",
+    "@expo/xdl": "54.1.4",
     "@google-cloud/logging-bunyan": "^0.9.5",
     "async-retry": "^1.2.1",
     "aws-sdk": "^2.226.1",
@@ -132,7 +131,7 @@
     "request": "^2.88.0",
     "request-progress": "^3.0.0",
     "semver": "^6.0.0",
-    "sharp": "0.22.1",
+    "sharp": "^0.21.0",
     "source-map-support": "^0.5.6",
     "tar": "^4.4.6",
     "uuid": "^3.2.1",

scripts/android/configureAndroidSdk.sh

@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-SDKMANAGER=$ANDROID_HOME/tools/bin/sdkmanager
-
-yes | $SDKMANAGER --licenses > /dev/null
-if [[ "$1" = "--install-all-platforms" ]]; then
-  yes | $SDKMANAGER \
-    "platforms;android-23" \
-    "platforms;android-24" \
-    "platforms;android-25" \
-    "platforms;android-26" \
-    "platforms;android-27" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
-fi
-yes | $SDKMANAGER "platforms;android-28" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
-yes | $SDKMANAGER "platform-tools" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
-yes | $SDKMANAGER "build-tools;28.0.3" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
-yes | $SDKMANAGER \
-  "extras;android;m2repository" \
-  "extras;google;m2repository" \
-  "extras;google;google_play_services" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]

scripts/android/supervisordEventListener.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-printf "READY\n"; # signal to superivsord that listener is ready
-
-while read line; do
-  echo "[supervisord:eventlistener] Processing Event: $line" >&2;
-  kill -SIGQUIT $PPID
-done < /dev/stdin

scripts/cli/configureAndroidSdk.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+SDKMANAGER=$ANDROID_HOME/tools/bin/sdkmanager
+
+yes | $SDKMANAGER --licenses > /dev/null
+yes | $SDKMANAGER "platforms;android-28"
+yes | $SDKMANAGER "platform-tools"
+yes | $SDKMANAGER "build-tools;28.0.3"
+yes | $SDKMANAGER \
+  "extras;android;m2repository" \
+  "extras;google;m2repository" \
+  "extras;google;google_play_services"

shellTarballs/android/sdk33

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-5090aab941f92c912c6643a1e25cc69f9f67d8e6.tar.gz
+s3://exp-artifacts/android-shell-builder-86974c7df1fc9db46f02b59f4a663b45e2f7a2af.tar.gz

src/bin/commands/build/android.ts

@@ -1,5 +1,6 @@
 import fs from 'fs-extra';
 import _ from 'lodash';
+import uuid from 'uuid';
 
 import { ErrorWithCommandHelp } from 'turtle/bin/commands/ErrorWithCommandHelp';
 import { createBuilderAction } from 'turtle/bin/utils/builder';
@@ -23,21 +24,16 @@ export default (program: any, setCommonCommandOptions: any) => {
       /^(app-bundle|apk)$/i,
       'app-bundle',
     )
-    .option(
-      '-m --mode <build>',
-      'type of build: debug|release',
-      /^(debug|release)$/i,
-      'release',
-    )
     .description(
-      'Build a standalone APK or App Bundle for your project, either signed and ready for submission to'
-      + ' the Google Play Store or in debug mode.',
+      'Build a standalone APK or App Bundle for your project, signed and ready for submission to the Google Play'
+      + ' Store.',
     )
     .asyncAction(
       createBuilderAction({
         program,
         command,
         prepareCredentials,
+        buildJobObject,
         builder,
         platform: PLATFORMS.ANDROID,
         os: ['darwin', 'linux'],
@@ -45,6 +41,26 @@ export default (program: any, setCommonCommandOptions: any) => {
     );
 };
 
+const buildJobObject = (
+  appJSON: any,
+  { releaseChannel, username, projectDir, publicUrl, buildType }: any,
+  credentials: any,
+) => ({
+  config: {
+    ..._.get(appJSON, 'expo.android.config', {}),
+    releaseChannel,
+    androidPackage: _.get(appJSON, 'expo.android.package'),
+    publicUrl,
+    buildType,
+  },
+  id: uuid.v4(),
+  platform: PLATFORMS.ANDROID,
+  sdkVersion: _.get(appJSON, 'expo.sdkVersion'),
+  projectDir,
+  experienceName: `@${username}/${_.get(appJSON, 'expo.slug')}`,
+  ...(credentials && { credentials }),
+});
+
 const prepareCredentials = async (cmd: any) => {
   const { keystorePath, keystoreAlias } = cmd;
   const keystorePassword = process.env.EXPO_ANDROID_KEYSTORE_PASSWORD;

src/bin/commands/build/ios.ts

@@ -1,5 +1,6 @@
 import fs from 'fs-extra';
 import _ from 'lodash';
+import uuid from 'uuid';
 
 import { ErrorWithCommandHelp } from 'turtle/bin/commands/ErrorWithCommandHelp';
 import { createBuilderAction } from 'turtle/bin/utils/builder';
@@ -31,6 +32,7 @@ export default (program: any, setCommonCommandOptions: any) => {
         program,
         command,
         prepareCredentials,
+        buildJobObject,
         builder,
         platform: PLATFORMS.IOS,
         os: 'darwin',
@@ -38,6 +40,21 @@ export default (program: any, setCommonCommandOptions: any) => {
     );
 };
 
+const buildJobObject = (appJSON: any, { releaseChannel, buildType, username, publicUrl }: any, credentials: any) => ({
+  config: {
+    ..._.get(appJSON, 'expo.ios.config', {}),
+    buildType,
+    releaseChannel,
+    bundleIdentifier: _.get(appJSON, 'expo.ios.bundleIdentifier'),
+    publicUrl,
+  },
+  id: uuid.v4(),
+  platform: PLATFORMS.IOS,
+  sdkVersion: _.get(appJSON, 'expo.sdkVersion'),
+  experienceName: `@${username}/${_.get(appJSON, 'expo.slug')}`,
+  ...(credentials && { credentials }),
+});
+
 const prepareCredentials = async (cmd: any) => {
   if (cmd.type !== IOS_BUILD_TYPES.ARCHIVE) {
     return null;

src/bin/setup/android/index.ts

@@ -20,6 +20,10 @@ const REQUIRED_TOOLS: IToolDefinition[] = [
     command: 'bash',
     missingDescription: 'Please install bash',
   },
+  {
+    command: 'gulp',
+    missingDescription: 'Run `npm install -g gulp-cli` (or `yarn global add gulp-cli`) to install gulp',
+  },
   {
     command: 'javac',
     missingDescription: 'Please install JDK (version 8 or newer) - check https://jdk.java.net/',
@@ -63,7 +67,7 @@ function formatShellAppTarballUriPath(sdkMajorVersion: string) {
   return path.join(config.directories.shellTarballsDir, PLATFORMS.ANDROID, `sdk${sdkMajorVersion}`);
 }
 
-async function _shellAppPostDownloadAction(sdkVersion: string, workingdir: string) {
+async function _shellAppPostDownloadAction(workingdir: string) {
   const inWorkingdir = (filename: string) => path.join(workingdir, filename);
 
   if (await fs.pathExists(inWorkingdir('universe-package.json'))) {
@@ -78,11 +82,9 @@ async function _shellAppPostDownloadAction(sdkVersion: string, workingdir: strin
     await _installNodeModules(workingdir);
   }
 
-  // TODO: remove this after making sure that we don't need node_modules in tools-public for older sdks
-  if (ExponentTools.parseSdkMajorVersion(sdkVersion) < 33) {
-    const toolsPublicDir = path.join(workingdir, 'tools-public');
-    await _installNodeModules(toolsPublicDir);
-  }
+  // TODO: remove following lines after upgrading android shell app
+  const toolsPublicDir = path.join(workingdir, 'tools-public');
+  await _installNodeModules(toolsPublicDir);
 }
 
 async function _installNodeModules(cwd: string) {

src/bin/setup/android/ndk.ts

@@ -4,7 +4,7 @@ import path from 'path';
 import decompress from 'decompress';
 import fs from 'fs-extra';
 
-import * as utils from 'turtle/bin/setup/utils/common';
+import { formatArtifactDownloadPath } from 'turtle/bin/setup/utils/common';
 import download from 'turtle/bin/setup/utils/downloader';
 import config from 'turtle/config';
 import logger from 'turtle/logger';
@@ -16,10 +16,9 @@ const l = logger.child(LOGGER_FIELDS);
 
 export default async function ensureAndroidNDKIsPresent() {
   const androidNdkDir = path.join(config.directories.androidDependenciesDir, 'ndk');
-  await utils.removeDirectoryUnlessReady(androidNdkDir);
   if (!(await fs.pathExists(androidNdkDir))) {
     await fs.ensureDir(androidNdkDir);
-    const androidNdkDownloadPath = utils.formatArtifactDownloadPath(ANDROID_NDK_URL);
+    const androidNdkDownloadPath = formatArtifactDownloadPath(ANDROID_NDK_URL);
 
     try {
       l.info('Downloading Android NDK');
@@ -27,7 +26,6 @@ export default async function ensureAndroidNDKIsPresent() {
       await download(ANDROID_NDK_URL, androidNdkDownloadPath);
       l.info('Decompressing Android NDK');
       await decompress(androidNdkDownloadPath, androidNdkDir, { strip: 1 });
-      await utils.markDirectoryAsReady(androidNdkDir);
       l.info('Android NDK installed successfully');
     } catch (err) {
       await fs.remove(androidNdkDir);

src/bin/setup/android/sdk.ts

@@ -5,7 +5,7 @@ import { ExponentTools } from '@expo/xdl';
 import decompress from 'decompress';
 import fs from 'fs-extra';
 
-import * as utils from 'turtle/bin/setup/utils/common';
+import { formatArtifactDownloadPath } from 'turtle/bin/setup/utils/common';
 import download from 'turtle/bin/setup/utils/downloader';
 import config from 'turtle/config';
 import logger from 'turtle/logger';
@@ -17,10 +17,9 @@ const l = logger.child(LOGGER_FIELDS);
 
 export default async function ensureAndroidSDKIsPresent() {
   const androidSdkDir = path.join(config.directories.androidDependenciesDir, 'sdk');
-  await utils.removeDirectoryUnlessReady(androidSdkDir);
   if (!(await fs.pathExists(androidSdkDir))) {
     await fs.ensureDir(androidSdkDir);
-    const androidSdkDownloadPath = utils.formatArtifactDownloadPath(ANDROID_SDK_URL);
+    const androidSdkDownloadPath = formatArtifactDownloadPath(ANDROID_SDK_URL);
 
     try {
       l.info('Downloading Android SDK');
@@ -32,7 +31,6 @@ export default async function ensureAndroidSDKIsPresent() {
       await fs.remove(androidSdkDownloadPath);
       l.info('Configuring Android SDK, this may take a while');
       await _configureSdk(androidSdkDir);
-      await utils.markDirectoryAsReady(androidSdkDir);
       l.info('Android SDK installed and configured successfully');
     } catch (err) {
       await fs.remove(androidSdkDir);
@@ -54,7 +52,7 @@ async function _configureSdk(androidSdkDir: string) {
   await ExponentTools.spawnAsyncThrowError('./configureAndroidSdk.sh', [], {
     pipeToLogger: true,
     loggerFields: LOGGER_FIELDS,
-    cwd: path.join(config.directories.rootDir, 'scripts/android'),
+    cwd: path.join(config.directories.rootDir, 'scripts/cli'),
     env: {
       ...process.env,
       ANDROID_HOME: androidSdkDir,

src/bin/setup/utils/common.ts

@@ -17,7 +17,7 @@ interface IShellAppFormaters {
   formatShellAppTarballUriPath: (sdkMajorVersion: string) => string;
 }
 
-type PostDownloadAction = (sdkVersion: string, workingdir: string) => void;
+type PostDownloadAction = (workingdir: string) => void;
 
 export async function checkSystem(requiredTools: IToolDefinition[]) {
   await ensureToolsAreInstalled(requiredTools);
@@ -29,17 +29,14 @@ export async function ensureShellAppIsPresent(
   postDownloadAction?: PostDownloadAction,
 ) {
   const workingdir = formatters.formatShellAppDirectory({ sdkVersion });
-  const shellAppMetadata = await _readShellAppTarballS3Uri(sdkVersion, formatters);
-  await removeDirectoryUnlessReady(workingdir, shellAppMetadata);
   if (await fs.pathExists(workingdir)) {
     return;
   }
   l.info(`shell app for SDK ${sdkVersion} doesn't exist, downloading...`);
   await _downloadShellApp(sdkVersion, workingdir, formatters);
   if (postDownloadAction) {
-    await postDownloadAction(sdkVersion, workingdir);
+    await postDownloadAction(workingdir);
   }
-  await markDirectoryAsReady(workingdir, shellAppMetadata);
 }
 
 async function _downloadShellApp(sdkVersion: string, targetDirectory: string, formatters: IShellAppFormaters) {
@@ -68,31 +65,3 @@ async function _readShellAppTarballS3Uri(sdkVersion: string, formatters: IShellA
   const data = await fs.readFile(filePath, 'utf8');
   return data.trim();
 }
-
-export async function removeDirectoryUnlessReady(dir: string, metadata?: string) {
-  const readyFilePath = path.join(dir, '.ready');
-  const readyFileExists = await fs.pathExists(readyFilePath);
-  let shouldRemove = false;
-  if (readyFileExists) {
-    if (metadata !== undefined) {
-      const readyFileContents = (await fs.readFile(readyFilePath, 'utf-8')).trim();
-      if (readyFileContents !== metadata) {
-        shouldRemove = true;
-       }
-    }
-  } else {
-    shouldRemove = true;
-  }
-  if (shouldRemove) {
-    await fs.remove(dir);
-  }
-}
-
-export async function markDirectoryAsReady(dir: string, metadata?: string) {
-  const readyFilePath = path.join(dir, '.ready');
-  if (metadata === undefined) {
-    await fs.open(readyFilePath, 'w');
-  } else {
-    await fs.writeFile(readyFilePath, metadata);
-  }
-}

src/bin/utils/builder.ts

@@ -1,13 +1,10 @@
-import { ExponentTools } from '@expo/xdl';
 import _ from 'lodash';
-import uuid from 'uuid';
 
 import { ErrorWithCommandHelp } from 'turtle/bin/commands/ErrorWithCommandHelp';
 import { ErrorWithProgramHelp } from 'turtle/bin/commands/ErrorWithProgramHelp';
 import setup from 'turtle/bin/setup/setup';
 import * as ProjectUtils from 'turtle/bin/utils/project';
 import * as UserUtils from 'turtle/bin/utils/user';
-import { getExperienceUrl } from 'turtle/builders/utils/common';
 import logger from 'turtle/logger';
 import { sanitizeJob } from 'turtle/validator';
 
@@ -15,6 +12,7 @@ export function createBuilderAction({
   program,
   command,
   prepareCredentials,
+  buildJobObject,
   builder,
   platform,
   os,
@@ -57,7 +55,6 @@ export function createBuilderAction({
       const args = {
         releaseChannel: cmd.releaseChannel || 'default',
         buildType: cmd.type,
-        buildMode: cmd.mode,
         username: userData.username || 'anonymous',
         projectDir: ProjectUtils.resolveAbsoluteDir(projectDirArg),
         publicUrl: cmd.publicUrl,
@@ -68,7 +65,7 @@ export function createBuilderAction({
       await setup(platform, sdkVersion);
       const credentials = await prepareCredentials(cmd);
       const rawJob = {
-        ...await buildJobObject(platform, appJSON, args, credentials),
+        ...buildJobObject(appJSON, args, credentials),
         ...cmd.buildDir && { fakeUploadDir: ProjectUtils.resolveAbsoluteDir(cmd.buildDir) },
         ...cmd.output && { fakeUploadBuildPath: ProjectUtils.resolveAbsoluteDir(cmd.output) },
       };
@@ -85,38 +82,3 @@ export function createBuilderAction({
     }
   };
 }
-
-const buildJobObject = async (
-  platform: 'android' | 'ios',
-  appJSON: any,
-  { releaseChannel, buildType, buildMode, username, publicUrl, projectDir }: any,
-  credentials: any,
-) => {
-  const job = {
-    config: {
-      ..._.get(appJSON, 'expo.ios.config', {}),
-      buildType,
-      ...(platform === 'android' ? { buildMode } : {}),
-      releaseChannel,
-      ...(platform === 'ios' ? { bundleIdentifier: _.get(appJSON, 'expo.ios.bundleIdentifier') } : {}),
-      ...(platform === 'android' ? { androidPackage: _.get(appJSON, 'expo.android.package') } : {}),
-      publicUrl,
-    },
-    id: uuid.v4(),
-    platform,
-    projectDir,
-    sdkVersion: _.get(appJSON, 'expo.sdkVersion'),
-    experienceName: `@${username}/${_.get(appJSON, 'expo.slug')}`,
-    ...(credentials && { credentials }),
-  };
-  const url = getExperienceUrl(job.experienceName, job.config.publicUrl);
-
-  const manifest = await ExponentTools.getManifestAsync(url, {
-    'Exponent-SDK-Version': _.get(appJSON, 'expo.sdkVersion'),
-    'Exponent-Platform': platform,
-    'Expo-Release-Channel': releaseChannel,
-    'Accept': 'application/expo+json,application/json',
-  });
-
-  return { ...job, manifest };
-};

src/builders/android.ts

@@ -75,12 +75,12 @@ async function runShellAppBuilder(
 
   logger.info({ buildPhase: 'resolve native modules' }, 'Resolving universal modules dependencies');
   const enabledModules = semver.satisfies(sdkVersion, '>= 33.0.0')
-    ? await resolveNativeModules(workingDir, _.get(manifest, 'dependencies'))
+    ? await resolveNativeModules(workingDir, manifest.dependencies)
     : null;
 
   try {
     await AndroidShellApp.createAndroidShellAppAsync({
-      url: commonUtils.getExperienceUrl(jobData.experienceName, jobData.config.publicUrl),
+      url: commonUtils.getExperienceUrl(jobData),
       sdkVersion,
       keystore: tempKeystorePath,
       manifest,
@@ -93,7 +93,6 @@ async function runShellAppBuilder(
       outputFile: outputFilePath,
       modules: enabledModules,
       buildType: jobData.config.buildType,
-      buildMode: jobData.config.buildMode,
     });
   } catch (err) {
     commonUtils.logErrorOnce(err);

src/builders/utils/common.ts

@@ -1,9 +1,13 @@
 import * as url from 'url';
 
 import config from 'turtle/config';
+import { IJob } from 'turtle/job';
 import logger from 'turtle/logger';
 
-export function getExperienceUrl(experienceName: string, publicUrl?: string) {
+export function getExperienceUrl(job: IJob) {
+  const { experienceName, config: jobConfig } = job;
+  const { publicUrl } = jobConfig;
+
   // publicUrl is passed in if user wants to build an externally hosted app
   if (publicUrl) {
     return publicUrl;

src/builders/utils/ios/shellAppBuilder.ts

@@ -43,7 +43,7 @@ export default async function runShellAppBuilder(ctx: IContext, job: IJob): Prom
     });
   } else {
     Object.assign(shellAppParams, {
-      url: commonUtils.getExperienceUrl(job.experienceName, job.config.publicUrl),
+      url: commonUtils.getExperienceUrl(job),
       releaseChannel,
       sdkVersion,
     });

src/builders/utils/unimodules.ts

@@ -44,11 +44,9 @@ export async function resolveNativeModules(workingdir: string, packages?: string
 
 async function readCorePackages(workingdir: string) {
   const pkgJsonPath = path.join(workingdir, 'node_modules', 'react-native-unimodules', 'package.json');
-  const expoPkgJsonPath = path.join(workingdir, 'packages', 'expo', 'package.json');
-  if (await fs.pathExists(pkgJsonPath) && await fs.pathExists(expoPkgJsonPath)) {
+  if (await fs.pathExists(pkgJsonPath)) {
     const packageJson = JSON.parse(await fs.readFile(pkgJsonPath, 'utf-8'));
-    const expoPackageJson = JSON.parse(await fs.readFile(expoPkgJsonPath, 'utf-8'));
-    return keys(packageJson.dependencies).concat(keys(expoPackageJson.dependencies));
+    return keys(packageJson.dependencies);
   } else {
     logger.warn('No core packages detected');
     return [];

src/constants/index.ts

@@ -16,9 +16,4 @@ export enum ANDROID_BUILD_TYPES {
   APP_BUNDLE = 'app-bundle',
 }
 
-export enum ANDROID_BUILD_MODES {
-  DEBUG = 'debug',
-  RELEASE = 'release',
-}
-
 export { BUILD };

src/job.ts

@@ -1,4 +1,4 @@
-import { ANDROID_BUILD_MODES, ANDROID_BUILD_TYPES, IOS_BUILD_TYPES } from 'turtle/constants';
+import { ANDROID_BUILD_TYPES, IOS_BUILD_TYPES } from 'turtle/constants';
 
 export interface IJob {
   platform: 'android' | 'ios';
@@ -14,7 +14,6 @@ export interface IJob {
     bundleIdentifier?: string;
     // android
     androidPackage?: string;
-    buildMode?: ANDROID_BUILD_MODES;
   };
   credentials: {
     // android

src/jobManager.ts

@@ -64,10 +64,7 @@ async function processJob(jobData: any) {
     setCurrentJobId(job.id);
     const pingerHandle = sqs.changeMessageVisibilityRecurring(priority, jobData.ReceiptHandle, job.id);
 
-    logger.info(
-      `Doing job MessageId=${jobData.MessageId} BuildId=${job.id} `
-      + `Priority=${priority.slice(0, priority.length - 8)} ${Date.now()}`,
-    );
+    logger.info(`Doing job MessageId=${jobData.MessageId} BuildId=${job.id} ${Date.now()}`);
 
     const cancelled = await redis.checkIfCancelled(job.id);
     if (cancelled) {

src/jobsSchemas/android.ts

@@ -1,6 +1,6 @@
 import Joi from 'joi';
 
-import { ANDROID_BUILD_MODES, ANDROID_BUILD_TYPES, PLATFORMS } from 'turtle/constants';
+import { PLATFORMS } from 'turtle/constants';
 import baseJobSchema from 'turtle/jobsSchemas/base';
 
 export default baseJobSchema.concat(
@@ -12,9 +12,5 @@ export default baseJobSchema.concat(
       keystoreAlias: Joi.string(),
       keystore: Joi.string(),
     }),
-    config: Joi.object().keys({
-      buildMode: Joi.string().valid(Object.values(ANDROID_BUILD_MODES)).default(ANDROID_BUILD_MODES.RELEASE),
-      buildType: Joi.string().valid(Object.values(ANDROID_BUILD_TYPES)).default(ANDROID_BUILD_TYPES.APK),
-    }),
   }),
 );

src/logger/index.ts

@@ -17,7 +17,6 @@ class Logger {
       name: 'turtle',
       level: config.logger.level,
       platform: config.platform,
-      serializers: bunyan.stdSerializers,
       ...config.deploymentEnv && { environment: config.deploymentEnv },
       streams: Object.values(streams),
     });

src/scripts/setConfigurations.ts

@@ -43,13 +43,13 @@ const AVAILABLE_CONFIGURATIONS_ANDROID = [
   HIGH_CONFIGURATION,
   HIGH_CONFIGURATION,
   HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
+  HIGH_ONLY_CONFIGURATION,
+  HIGH_ONLY_CONFIGURATION,
+  HIGH_ONLY_CONFIGURATION,
+  HIGH_ONLY_CONFIGURATION,
+  HIGH_ONLY_CONFIGURATION,
+  HIGH_ONLY_CONFIGURATION,
+  HIGH_ONLY_CONFIGURATION,
   HIGH_CONFIGURATION,
   HIGH_CONFIGURATION,
   HIGH_CONFIGURATION,

supervisord.conf

@@ -1,17 +0,0 @@
-[supervisord]
-nodaemon=true
-
-[program:turtle]
-directory=/app/turtle
-command=node ./build/server.js
-autorestart=true
-startretries=5
-startsecs=600
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-
-[eventlistener:turtle_failure]
-events=PROCESS_STATE_FATAL
-command=/app/turtle/scripts/android/supervisordEventListener.sh