address pr review requests

CHANGELOG.md

@@ -5,16 +5,8 @@ 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.5.3] - 2019-01-21
-### Fixed
-- Building Android standalone apps ([not accepted license issue](https://github.com/expo/expo/issues/3266)) - updated Android build tools (`build-tools;28.0.3`, `platforms;android-28`).
-
-## [0.5.2] - 2019-01-18
 ### Added
 - The link (in README) to the repository containing `turtle-cli` usage example.
-- [Contributing guide](CONTRIBUTING.md).
-- [Code of Conduct](CODE_OF_CONDUCT.md).
 ### Removed
 - `eslint`
 ### Changed

Dockerfile

@@ -36,34 +36,30 @@ RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-
 # Download and untar SDK
 ENV ANDROID_HOME /usr/local/android-sdk-linux
 ENV ANDROID_SDK /usr/local/android-sdk-linux
-ENV ANDROID_SDK_URL https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip
+ENV ANDROID_SDK_URL https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip
 RUN mkdir -p ${ANDROID_HOME} && \
   curl -L "${ANDROID_SDK_URL}" > ${ANDROID_HOME}/sdk.zip && \
   cd ${ANDROID_HOME} && \
   unzip -qq sdk.zip && \
   rm sdk.zip && \
+  # prevents warnings about missing repo config
   mkdir -p ${HOME}/.android && \
   touch ${HOME}/.android/repositories.cfg
 
 ENV PATH ${ANDROID_HOME}/platform-tools:${PATH}
 ENV PATH ${ANDROID_HOME}/tools:${PATH}
 ENV PATH ${ANDROID_HOME}/tools/bin:${PATH}
-ENV PATH ${ANDROID_HOME}/build-tools/28.0.3/:${PATH}
+ENV PATH ${ANDROID_HOME}/build-tools/25.0.0/:${PATH}
 
 RUN yes | sdkmanager --licenses > /dev/null
-RUN yes | sdkmanager \
+
+# Install Android SDK components
+RUN sdkmanager \
+  "platform-tools" \
   "platforms;android-23" \
-  "platforms;android-24" \
-  "platforms;android-25" \
-  "platforms;android-26" \
-  "platforms;android-27" \
-  "platforms;android-28"
-RUN yes | sdkmanager "platform-tools"
-RUN yes | sdkmanager "build-tools;28.0.3"
-RUN yes | sdkmanager \
+  "build-tools;25.0.0" \
   "extras;android;m2repository" \
-  "extras;google;m2repository" \
-  "extras;google;google_play_services"
+  "extras;google;m2repository"
 
 # Install Android NDK
 ENV ANDROID_NDK_VERSION android-ndk-r10e

package.json

@@ -1,6 +1,6 @@
 {
   "name": "turtle-cli",
-  "version": "0.5.3",
+  "version": "0.5.1",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {

scripts/build.sh

@@ -2,23 +2,16 @@
 
 set -xeo pipefail
 
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
-
 if [ -z "$1" ]; then
   echo "Please specify a platform to build"
   exit 1
 fi
 
-PLATFORM=$1
+export PLATFORM=$1
 
 yarn
 yarn run build
-if [ "$PLATFORM" = "android" ]; then
-  $ROOT_DIR/scripts/android/fetchRemoteAndroidTarball.sh
-elif [ "$PLATFORM" = "ios" ]; then
-  $ROOT_DIR/scripts/ios/fetchRemoteIosTarball.sh
-fi
-
+yarn set-workingdir:remote
 
 if [[ -z "${TARBALL}" ]]; then
   echo "TARBALL is not set, building tarball skipped"

scripts/cli/configureAndroidSdk.sh

@@ -1,12 +1,9 @@
 #!/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 \
+yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses > /dev/null
+$ANDROID_HOME/tools/bin/sdkmanager \
+  "platform-tools" \
+  "platforms;android-23" \
+  "build-tools;25.0.0" \
   "extras;android;m2repository" \
-  "extras;google;m2repository" \
-  "extras;google;google_play_services"
+  "extras;google;m2repository"

scripts/testAndroidCI.sh

@@ -20,8 +20,7 @@ export API_PORT="3000"
 export REDIS_URL="noop"
 export REDIS_CONFIG_URL="noop"
 
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
-$ROOT_DIR/scripts/android/fetchRemoteAndroidTarball.sh
+PLATFORM=android yarn set-workingdir:remote
 
 yarn test:smoke:android
 smoke_result=$?

scripts/testIosCI.sh

@@ -18,8 +18,7 @@ export API_PORT="443"
 export REDIS_URL="noop"
 export REDIS_CONFIG_URL="noop"
 
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
-$ROOT_DIR/scripts/ios/fetchRemoteIosTarball.sh
+PLATFORM=ios yarn set-workingdir:remote
 
 yarn test:smoke:ios
 smoke_result=$?

src/bin/setup/android/sdk.ts

@@ -10,7 +10,7 @@ import download from 'turtle/bin/setup/utils/downloader';
 import config from 'turtle/config';
 import logger from 'turtle/logger';
 
-const ANDROID_SDK_URL = 'https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip';
+const ANDROID_SDK_URL = 'https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip';
 
 const LOGGER_FIELDS = { buildPhase: 'setting up environment' };
 const l = logger.withFields(LOGGER_FIELDS);
@@ -73,6 +73,6 @@ function _createPaths(androidSdkDir: string) {
     path.join(androidSdkDir, 'platform-tools'),
     path.join(androidSdkDir, 'tools'),
     path.join(androidSdkDir, 'tools/bin'),
-    path.join(androidSdkDir, 'build-tools/28.0.3'),
+    path.join(androidSdkDir, 'build-tools/25.0.0'),
   ];
 }

src/jobManager.ts

@@ -75,21 +75,20 @@ async function processJob(jobData: any) {
       logger.info('The job has been cancelled');
     } else {
       redis.registerListener(job.id, () => deleteMessage(priority, receiptHandle));
-      const startTimestamp = Date.now();
+      const startTimestamp = +new Date();
       let buildFailed = false;
       const buildType = _.get(job, 'config.buildType', 'default');
       try {
-        const status = await build(job);
-        buildStatusMetric.add(buildType, status);
-        buildFailed = !status;
+        const success = await build(job);
+        buildStatusMetric.add(buildType, success);
+        buildFailed = !success;
       } catch (err) {
         buildStatusMetric.add(buildType, false);
         buildFailed = true;
         throw err;
       } finally {
-        const endTimestamp = Date.now();
+        const endTimestamp = +new Date();
         const turtleBuildDurationSecs = Math.ceil((endTimestamp - startTimestamp) / 1000);
-        logger.info(`BuildID=${job.id} Build duration=${turtleBuildDurationSecs}`);
         buildDurationMetric.addTurtleDuration(buildType, turtleBuildDurationSecs, !buildFailed);
         if (job.messageCreatedTimestamp) {
           const totalBuildDurationSecs = Math.ceil(
@@ -124,9 +123,7 @@ function failAfterMaxJobTime(priority: string, receiptHandle: string, job: any)
 }
 
 async function build(job: any) {
-  const startTimestamp = Date.now();
   const s3Url = await logger.init(job);
-  const calculateBuildDuration = () => Math.ceil((Date.now() - startTimestamp) / 1000);
 
   try {
     await sqs.sendMessage(job.id, BUILD.JOB_STATES.IN_PROGRESS, {
@@ -134,17 +131,11 @@ async function build(job: any) {
       logFormat: 'json',
     });
     const result = await (builders as any)[job.platform](job);
-    const buildDuration = calculateBuildDuration();
-    sqs.sendMessage(job.id, BUILD.JOB_STATES.FINISHED, {
-      ...result,
-      turtleVersion,
-      buildDuration,
-    });
+    sqs.sendMessage(job.id, BUILD.JOB_STATES.FINISHED, { ...result, turtleVersion });
     return true;
   } catch (err) {
     logErrorOnce(err);
-    const buildDuration = calculateBuildDuration();
-    sqs.sendMessage(job.id, BUILD.JOB_STATES.ERRORED, { turtleVersion, buildDuration });
+    sqs.sendMessage(job.id, BUILD.JOB_STATES.ERRORED, { turtleVersion });
     return false;
   } finally {
     await logger.cleanup(job);