try out time again

* Fix building SDK33 Android tarball without universe-package.json in single build mode

* Add CHANGELOG entry

CHANGELOG.md

@@ -18,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,6 +21,7 @@ RUN dpkg --add-architecture i386 && \
   libncurses5:i386\
   libstdc++6:i386\
   rsync\
+  time\
   unzip\
   yarn\
   zlib1g:i386\
@@ -100,12 +101,12 @@ RUN rm gradle-4.4-all.zip
 ENV GRADLE_HOME /usr/local/gradle-4.4
 ENV PATH ${GRADLE_HOME}/bin:$PATH
 
-ADD . /app
+ADD . /app/turtle
 
-RUN mv /app/workingdir /tmp && \
-    for SDK_VERSION in `ls /tmp/workingdir/android/`; do \
+RUN mv /app/turtle/workingdir /app && \
+    for SDK_VERSION in `ls /app/workingdir/android/`; do \
       echo "preparing $SDK_VERSION shell app" && \
-      cd /tmp/workingdir/android/$SDK_VERSION && \
+      cd /app/workingdir/android/$SDK_VERSION && \
       if [ -f universe-package.json ]; then \
       mv package.json exponent-package.json && \
       mv universe-package.json package.json && \
@@ -116,11 +117,11 @@ RUN mv /app/workingdir /tmp && \
       yarn install; \
       fi \
     ; done && \
-    mv /tmp/workingdir /app
+    time mv /app/workingdir /app/turtle
 
 ENV NODE_ENV "production"
-ENV TURTLE_WORKING_DIR_PATH /app/workingdir/
+ENV TURTLE_WORKING_DIR_PATH /app/turtle/workingdir/
 
-WORKDIR /app
+WORKDIR /app/turtle
 
 CMD ["node", "./build/server.js"]

scripts/setWorkingdirMode.sh

@@ -61,6 +61,10 @@ setup_remote() {
       mv $sdk/package.json $sdk/exponent-package.json
       mv $sdk/universe-package.json $sdk/package.json
       cd $sdk && yarn
+    else
+      if [[ -f "$sdk/package.json" ]]; then
+        cd $sdk && yarn
+      fi
     fi
   done
 }

src/bin/setup/android/index.ts

@@ -70,11 +70,17 @@ function formatShellAppTarballUriPath(sdkMajorVersion: string) {
 async function _shellAppPostDownloadAction(workingdir: string) {
   const inWorkingdir = (filename: string) => path.join(workingdir, filename);
 
-  await fs.move(inWorkingdir('package.json'), inWorkingdir('exponent-package.json'));
-  await fs.move(inWorkingdir('universe-package.json'), inWorkingdir('package.json'));
-  await _installNodeModules(workingdir);
-  await fs.move(inWorkingdir('package.json'), inWorkingdir('universe-package.json'));
-  await fs.move(inWorkingdir('exponent-package.json'), inWorkingdir('package.json'));
+  if (await fs.pathExists(inWorkingdir('universe-package.json'))) {
+    // legacy shell app built from universe
+    await fs.move(inWorkingdir('package.json'), inWorkingdir('exponent-package.json'));
+    await fs.move(inWorkingdir('universe-package.json'), inWorkingdir('package.json'));
+    await _installNodeModules(workingdir);
+    await fs.move(inWorkingdir('package.json'), inWorkingdir('universe-package.json'));
+    await fs.move(inWorkingdir('exponent-package.json'), inWorkingdir('package.json'));
+  } else {
+    // new shell app built from expo or not
+    await _installNodeModules(workingdir);
+  }
 
   // TODO: remove following lines after upgrading android shell app
   const toolsPublicDir = path.join(workingdir, 'tools-public');