change path to build-tools

CHANGELOG.md

@@ -5,29 +5,6 @@ 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]
-### Added
-- Register Turtle version in Redis
-
-## [0.5.8] - 2019-02-06
-- Update iOS shell app for SDK 32 (fixes bare notifications [issue](https://github.com/expo/expo/issues/3223)).
-
-## [0.5.7] - 2019-01-31
-- Update Android shell app for SDK 32 to fix bundled assets issue.
-
-## [0.5.6] - 2019-01-25
-- Update iOS shell app for SDK 30, 31 and 32 (built with xcode 10.1).
-
-## [0.5.5] - 2019-01-24
-### Added
-- Sending build duration in AWS SQS messages (of `FINISHED` and `ERRORED` types).
-
-## [0.5.4] - 2019-01-22
-### Changed
-- Update iOS shell app for SDK32 to [`expo/expo#0847c10`](https://github.com/expo/expo/commit/0847c1073d38c366866f3d9279ddd662da47dc9b), i.e. v2.10.3 with fixed WebView navigation scheme and upgraded Facebook SDK.
-
-## [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
@@ -41,11 +18,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [0.5.1] - 2019-01-16
 ### Changed
-- Update Android shell app for SDK32 that includes `[email protected]`.
+- Update Android shell app for SDK32 that includes react-native-screens@1.0.0-alpha.22
 
 ## [0.5.0] - 2019-01-16
 ### Added
-- Turtle version is added to the `onFinish` and `onError` build messages.
+- Turtle version is added to onFinish and onError build messages.
 ### Changed
 - A version property value being sent to the queue. It's now the version number
 from `package.json` instead of `new`/`old` indicator.

CONTRIBUTING.md

@@ -29,5 +29,3 @@ To submit a pull request:
 ## Publishing a release
 - To release a new version of `turtle-cli`, run `yarn release` command.
 - If you wish to release a new *beta* version of `turtle-cli`, run `yarn release:beta` instead.
-- Update [Changelog](CHANGELOG.md).
-- In a terminal, `cd` into [expo/turtle-cli-example](https://github.com/expo/turtle-cli-example) repository, run `yarn update-turtle-cli-version` (this script updates `turtle-cli` version number in CI configuration files and commits the changes) and then run `git push`. Thanks!

package.json

@@ -1,6 +1,6 @@
 {
   "name": "turtle-cli",
-  "version": "0.5.10",
+  "version": "0.5.2",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {
@@ -28,8 +28,8 @@
     "test:smoke": "yarn test --config jest/smoke-config.json --forceExit",
     "test:smoke:android": "yarn test:smoke --testNamePattern=android",
     "test:smoke:ios": "PLATFORM=ios yarn test:smoke --testNamePattern=iOS",
-    "release": "./scripts/release.sh",
-    "release:beta": "./scripts/releaseBeta.sh",
+    "release": "release-it",
+    "release:beta": "yarn release -c .release-it.beta.json --preRelease=beta",
     "ssh:android:pods-names": "./scripts/ssh/findAndroidPods.sh",
     "ssh:android:connect": "./scripts/ssh/connectToAndroidPod.sh",
     "ssh:ios:ips": "./scripts/ssh/findIosIps.sh",

scripts/release.sh

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-set -eo pipefail
-
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
-
-$ROOT_DIR/node_modules/.bin/release-it
-echo
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-echo "!!!! PLEASE REMEMBER TO UPDATE CHANGELOG !!!!"
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

scripts/releaseBeta.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-set -eo pipefail
-
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
-
-$ROOT_DIR/node_modules/.bin/release-it -c $ROOT_DIR/.release-it.beta.json --preRelease=beta

scripts/setWorkingdirMode.sh

@@ -48,10 +48,10 @@ setup_remote() {
     echo "Shell apps already fetched"
   else
     echo "Fetching shell apps"
-    if [ "$PLATFORM" != 'ios' ]; then
+    if [ "$PLATFORM" != 'ios']; then
       $ROOT_DIR/scripts/android/fetchRemoteAndroidTarball.sh
     fi
-    if [ "$PLATFORM" != 'android' ]; then
+    if [ "$PLATFORM" != 'android']; then
       $ROOT_DIR/scripts/ios/fetchRemoteIosTarball.sh
     fi
   fi

shellTarballs/android/sdk32

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-a4bd3bd26b1b31bdfa66c39b6b4d0d1d138c32fc.tar.gz
+s3://exp-artifacts/android-shell-builder-cb03fdc12dc74f699a6d3f22219cbcd30e01ac46.tar.gz

shellTarballs/ios/sdk30

@@ -1 +1 @@
-s3://exp-artifacts/ios-shell-builder-sdk-30-6863276e6b9605e31228c845a047387571959e9b.tar.gz
+s3://exp-artifacts/ios-shell-builder-sdk-30-7d017a96d00fbf18ee7e5581ea47528b9cc78afd.tar.gz

shellTarballs/ios/sdk31

@@ -1 +1 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-e1a8bd0ab2e1eba546792c0ffc282b5b202ccc39.tar.gz
+s3://exp-artifacts/ios-shell-builder-sdk-latest-56824ecea6ba10f5a9d8991545a1c47ee3284f5f.tar.gz

shellTarballs/ios/sdk32

@@ -1 +1 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-f6e1921542b2e26b4b9221dd2eddb74ea5cfdf74.tar.gz
+s3://exp-artifacts/ios-shell-builder-sdk-latest-e3855783ed0618f4dcf326dc353c6e2951e05c49.tar.gz

src/jobManager.ts

@@ -1,3 +1,6 @@
+import path from 'path';
+
+import fs from 'fs-extra';
 import _ from 'lodash';
 
 import * as sqs from 'turtle/aws/sqs';
@@ -8,11 +11,13 @@ import { BUILD } from 'turtle/constants/index';
 import logger from 'turtle/logger';
 import * as buildDurationMetric from 'turtle/metrics/buildDuration';
 import * as buildStatusMetric from 'turtle/metrics/buildStatus';
-import { checkShouldExit, setCurrentJobId, turtleVersion } from 'turtle/turtleContext';
+import { checkShouldExit, setCurrentJobId } from 'turtle/turtleContext';
 import { getPriorities } from 'turtle/utils/priorities';
 import * as redis from 'turtle/utils/redis';
 import { sanitizeJob } from 'turtle/validator';
 
+const { version: turtleVersion } = JSON.parse(fs.readFileSync(path.join(__dirname, '../package.json'), 'utf-8'));
+
 function _maybeExit() {
   if (checkShouldExit()) {
     logger.warn('Exiting due to previously received termination signal.');
@@ -70,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(
@@ -119,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, {
@@ -129,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);

src/server.ts

@@ -4,10 +4,7 @@ import config from 'turtle/config';
 import { doJob } from 'turtle/jobManager';
 import logger from 'turtle/logger';
 import setup from 'turtle/setup';
-import { checkShouldExit, setShouldExit, turtleVersion } from 'turtle/turtleContext';
-import { getRedisClient, RedisClient } from 'turtle/utils/redis';
-
-const REDIS_TURTLE_VERSION_KEY = 'turtle:version';
+import { checkShouldExit, setShouldExit } from 'turtle/turtleContext';
 
 process.on('unhandledRejection', (err) => logger.error('Unhandled promise rejection:', err));
 
@@ -33,15 +30,6 @@ async function main() {
   if (setup[config.platform]) {
     await setup[config.platform]();
   }
-
-  try {
-    const redis = await getRedisClient(RedisClient.Configuration);
-    await redis.set(REDIS_TURTLE_VERSION_KEY, turtleVersion);
-    logger.info(`Register Turtle version ${turtleVersion} in Redis`);
-  } catch (err) {
-    logger.error('Failed to register Turtle version in Redis', err);
-  }
-
   while (true) {
     try {
       await doJob();

src/turtleContext.ts

@@ -1,10 +1,5 @@
-import fs from 'fs-extra';
-import path from 'path';
 import config from 'turtle/config';
 
-const { version: turtleVersion } = JSON.parse(fs.readFileSync(path.join(__dirname, '../package.json'), 'utf-8'));
-export { turtleVersion };
-
 let shouldExit = false;
 let currentJobId: string | null = null;