[ci] use sdk 36 for android tests

.circleci/config.yml

@@ -9,7 +9,7 @@ executors:
     working_directory: ~/turtle
   mac:
     macos: # https://circleci.com/docs/2.0/testing-ios/#supported-xcode-versions
-      xcode: '11.1.0'
+      xcode: '10.1.0'
     working_directory: /Users/distiller/project
     shell: /bin/bash -leo pipefail
   android:
@@ -77,49 +77,6 @@ commands:
             EOF
             chmod +x /bin/rm
 
-  install_nodejs_mac:
-    parameters:
-      nodejs_version:
-        type: string
-        default: 12.16.1
-      yarn_version:
-        type: string
-        default: 1.22.0
-    steps:
-      - restore_cache:
-          key: "node-js-v1-darwin-archive-<< parameters.nodejs_version >>"
-      - run:
-          name: Uninstall yarn with brew
-          command: brew uninstall --force yarn
-      - install_node_and_yarn:
-          platform: darwin
-          nodejs_version: "<< parameters.nodejs_version >>"
-          yarn_version: "<< parameters.yarn_version >>"
-      - save_cache:
-          key: "node-js-v1-darwin-archive-<< parameters.nodejs_version >>"
-          paths:
-            - /private/tmp/nodejs.tar.xz
-
-  install_node_and_yarn:
-    parameters:
-      platform:
-        type: string
-      nodejs_version:
-        type: string
-      yarn_version:
-        type: string
-    steps:
-      - run:
-          name: Install node & yarn
-          command: |
-            NODEJS_ARCHIVE="/tmp/nodejs.tar.xz"
-            if [ ! -f "$NODEJS_ARCHIVE" ]; then
-              curl -o $NODEJS_ARCHIVE -SL "https://nodejs.org/dist/v<< parameters.nodejs_version >>/node-v<< parameters.nodejs_version >>-<< parameters.platform >>-x64.tar.xz"
-            fi
-            tar -xJf $NODEJS_ARCHIVE -C /usr/local --strip-components=1 --exclude CHANGELOG.md --exclude README.md --exclude LICENSE
-            ln -s /usr/local/bin/node /usr/local/bin/nodejs
-            npm install --global yarn@<< parameters.yarn_version >>
-
   decrypt_secrets_if_possible:
     steps:
       - run:
@@ -136,24 +93,18 @@ commands:
       workingdir:
         type: string
         default: .
-      platform:
-        type: string
-        default: linux
     steps:
       - restore_cache:
-          key: yarn-v2-<< parameters.platform >>-{{ checksum "<< parameters.workingdir >>/yarn.lock" }}
+          key: yarn-v1-{{ checksum "<< parameters.workingdir >>/yarn.lock" }}
 
   save_yarn_cache:
     parameters:
       workingdir:
         type: string
         default: .
-      platform:
-        type: string
-        default: linux
     steps:
       - save_cache:
-          key: yarn-v2-<< parameters.platform >>-{{ checksum "<< parameters.workingdir >>/yarn.lock" }}
+          key: yarn-v1-{{ checksum "<< parameters.workingdir >>/yarn.lock" }}
           paths:
             - ~/.cache/yarn # `yarn cache dir`
 
@@ -164,10 +115,10 @@ commands:
         default: ios
       sdk_version:
         type: string
-        default: sdk37
+        default: sdk36
     steps:
       - restore_cache:
-          key: "workingdir-v2-<< parameters.platform >>-<< parameters.sdk_version >>"
+          key: "workingdir-v1-<< parameters.platform >>-<< parameters.sdk_version >>"
 
   save_workingdir_cache:
     parameters:
@@ -179,10 +130,10 @@ commands:
         default: ios
       sdk_version:
         type: string
-        default: sdk37
+        default: sdk36
     steps:
       - save_cache:
-          key: "workingdir-v2-<< parameters.platform >>-<< parameters.sdk_version >>"
+          key: "workingdir-v1-<< parameters.platform >>-<< parameters.sdk_version >>"
           paths:
             - "<< parameters.workingdir >>/<< parameters.platform >>/<< parameters.sdk_version >>"
 
@@ -229,23 +180,20 @@ jobs:
     executor: mac
     steps:
       - install_nix
-      - install_nodejs_mac
       - setup
       - decrypt_secrets_if_possible
-      - restore_yarn_cache:
-          platform: darwin
+      - restore_yarn_cache
       - run: yarn
-      - save_yarn_cache:
-          platform: darwin
+      - save_yarn_cache
       - restore_workingdir_cache:
-          sdk_version: sdk37
+          sdk_version: sdk35
           platform: ios
       - run:
           name: Run iOS smoke tests
-          command: SDK_VERSION=sdk37 ./scripts/tests/runIOSSmokeTestsCI.sh
+          command: ./scripts/tests/runIOSSmokeTestsCI.sh
       - save_workingdir_cache:
           workingdir: /Users/distiller/project/workingdir
-          sdk_version: sdk37
+          sdk_version: sdk35
           platform: ios
 
   android_smoke_tests:
@@ -257,11 +205,11 @@ jobs:
       - run: yarn
       - save_yarn_cache
       - restore_workingdir_cache:
-          sdk_version: sdk37
+          sdk_version: sdk36
           platform: android
       - run:
           name: Fetch Android shell app
-          command: SDK_VERSION=sdk37 ./scripts/android/fetchRemoteAndroidTarball.sh
+          command: SDK_VERSION=sdk36 ./scripts/android/fetchRemoteAndroidTarball.sh
       - run:
           name: Run Android smoke tests
           command: |
@@ -269,7 +217,7 @@ jobs:
               --run "./scripts/tests/runAndroidSmokeTestsCI.sh"
       - save_workingdir_cache:
           workingdir: ~/turtle/workingdir
-          sdk_version: sdk37
+          sdk_version: sdk36
           platform: android
 
   android_staging_deploy:

.envrc

@@ -22,6 +22,6 @@ export NODE_ENV=development
 export EXPO_TURTLE_TOOLS_DIR="$(pwd)/tools"
 
 PATH_add $EXPO_TURTLE_TOOLS_DIR/bin
-if [ "$CI" = "true" ] && [[ ! $OSTYPE =~ darwin.* ]]; then
+if [ "$CI" = "true" ]; then
   PATH_add $EXPO_TURTLE_TOOLS_DIR/ci/bin
 fi

CHANGELOG.md

@@ -7,55 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-### Changed
-
-- Updated `@expo/xdl` to 57.8.30 (scoped the build command so it only builds the `:app` Android sub-project and not all the sub-projects available, [PR](https://github.com/expo/expo-cli/pull/1937)).
-
-## [0.14.8] - 2020-04-20
-
-### Changed
-
-- Updated `@expo/xdl` to 57.8.29 (removed call to `check-dynamic-macros-android.sh`, [PR](https://github.com/expo/expo-cli/pull/1933)).
-
-## [0.14.7] - 2020-04-20
-
-### Changed
-
-- Turtle no longer installs all dependencies of shell apps projects — only the production dependencies are installed now.
-- Updated `@expo/xdl` to 57.8.25 (fixed unintuitive `google-services.json` handling for SDK37+, [PR](https://github.com/expo/expo-cli/pull/1897)).
-
-## [0.14.6] - 2020-04-09
-
-### Changed
-
-- Updated @expo/xdl to 57.8.17 (fixed downloading assets smaller than 10 bytes).
-
-## [0.14.5] - 2020-04-06
-
-### Changed
-
-- Made @expo/config error more meaningful.
-
-## [0.14.4] - 2020-04-06
-
-### Fixed
-
-- Determining SDK version for Expo apps using SDK >=37.
-
-## [0.14.3] - 2020-04-03
-
-### Fixed
-
-- A fix for Android SDK 37 - `check-dynamic-macros-android.sh` doesn't use `jq` anymore.
-
-## [0.14.1] - 2020-04-01
-
-### Changed
-
-- Updated iOS shell app for SDK 37 to remove unnecessary unimodules.
-
-## [0.14.0] - 2020-03-31
-
 ### Added
 
 - Added iOS shell app for SDK 37.

Dockerfile

@@ -3,25 +3,27 @@ FROM gcr.io/exponentjs/turtle-android-base:0.4.0
 
 ADD . /app/turtle
 
-WORKDIR /app/turtle
-
-RUN ./scripts/fetchRemoteTarballs.sh android
-
-RUN ln -s /app/turtle/workingdir /app/workingdir && \
+RUN mv /app/turtle/workingdir /app && \
     for SDK_VERSION in `ls /app/workingdir/android/`; do \
       echo "preparing $SDK_VERSION shell app" && \
       cd /app/workingdir/android/$SDK_VERSION && \
-      mv packages non-workspace-packages && \
-      # Keep in sync with src/bin/setup/android/index.ts#_installNodeModules
-      # --prod requires --ignore-scripts (otherwise
-      # expo-yarn-workspaces errors as missing)
-      yarn install --ignore-scripts --prod && \
-      mv non-workspace-packages packages ; \
-    done
+      if [ -f universe-package.json ]; then \
+      mv package.json exponent-package.json && \
+      mv universe-package.json package.json && \
+      yarn install && \
+      mv package.json universe-package.json && \
+      mv exponent-package.json package.json; \
+      else \
+      yarn install; \
+      fi \
+    ; done && \
+    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"]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "turtle-cli",
-  "version": "0.14.9",
+  "version": "0.13.10",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {
@@ -102,9 +102,8 @@
     "typescript": "^3.4.2"
   },
   "dependencies": {
-    "@expo/config": "^3.0.5",
     "@expo/spawn-async": "^1.4.2",
-    "@expo/xdl": "57.8.30",
+    "@expo/xdl": "57.5.2",
     "@google-cloud/logging-bunyan": "^2.0.3",
     "async-retry": "^1.2.1",
     "aws-sdk": "^2.226.1",

scripts/build.sh

@@ -14,7 +14,7 @@ PLATFORM=$1
 yarn
 yarn run build
 if [ "$PLATFORM" = "android" ]; then
-  echo "shell apps will be fetched when building a Docker image"
+  $ROOT_DIR/scripts/android/fetchRemoteAndroidTarball.sh
 elif [ "$PLATFORM" = "ios" ]; then
   $ROOT_DIR/scripts/ios/fetchRemoteIosTarball.sh
 fi

scripts/tests/runAndroidSmokeTestsCI.sh

@@ -2,8 +2,6 @@
 
 set -ueo pipefail
 
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../.. && pwd )"
-
 export NODE_ENV=test
 
 export ENVIRONMENT="development"
@@ -26,8 +24,4 @@ export REDIS_CONFIG_URL="noop"
 export DATADOG_DISABLED="true"
 export TURTLE_SDK_VERSIONS_SECRET_TOKEN="noop"
 
-pushd $ROOT_DIR/workingdir/android/${SDK_VERSION:-sdk37} >/dev/null 2>&1
-yarn
-popd >/dev/null 2>&1
-
 yarn test:smoke:android

scripts/tests/runIOSSmokeTestsCI.sh

@@ -23,6 +23,6 @@ export DATADOG_DISABLED="true"
 export TURTLE_SDK_VERSIONS_SECRET_TOKEN="noop"
 
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../.. && pwd )"
-$ROOT_DIR/scripts/ios/fetchRemoteIosTarball.sh
+SDK_VERSION=sdk35 $ROOT_DIR/scripts/ios/fetchRemoteIosTarball.sh
 
 yarn test:smoke:ios

shellTarballs/android/sdk37

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-3cf3cf0707925322bcd667d5ba79120136f9afd8.tar.gz
+s3://exp-artifacts/android-shell-builder-1a6203cf1555c3b956a311ed539eafeb7594f030.tar.gz

shellTarballs/ios/sdk37

@@ -1 +1 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-549b9da7f764c6b75741aad3cd29a53aba809516.tar.gz
+s3://exp-artifacts/ios-shell-builder-sdk-latest-aadfc350d8e4ebf8dce9ce08723bb7e07d563846.tar.gz

src/__smoke__/fixtures/android/recording.json

@@ -1 +1 @@
-[{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_android_in.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult/><ResponseMetadata><RequestId>2f9926f3-9db4-588e-a00a-71f445522996</RequestId></ResponseMetadata></ReceiveMessageResponse>","rawHeaders":["x-amzn-RequestId","2f9926f3-9db4-588e-a00a-71f445522996","Date","Wed, 08 Apr 2020 13:50:35 GMT","Content-Type","text/xml","Content-Length","240"]},{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_android_in_priority.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult/><ResponseMetadata><RequestId>e42b6179-9846-5d83-9209-367e40aa9c02</RequestId></ResponseMetadata></ReceiveMessageResponse>","rawHeaders":["x-amzn-RequestId","e42b6179-9846-5d83-9209-367e40aa9c02","Date","Wed, 08 Apr 2020 13:50:41 GMT","Content-Type","text/xml","Content-Length","240"]},{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_android_in.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult><Message><MessageId>093d5a52-932c-4141-958a-4ee8146dadab</MessageId><ReceiptHandle>AQEBq2BDKWkc+YFuyL+qBVQ6RCqne9ndyzDri6BeHTv+HhCU3kOlINEzzqbgrGJXh49AB6lVInGNsI+uc5uMhC61UscDKfFeqgfhDDUftovz6RXwiIj+xRalgP5fPZn94LbY4KmUoCuGCpXu9UlGxOoorYTkLft9AVY6kabCRlXA8SJzzYjUb1s+rtBoWS3Trj/AOIxOy0EqxeEWpBsNKc1yWc9RNbZ8/qABFLMjOzdmr5gaLEDoRJTUZZUEu9TVOxrC54ES+UaCmgVY17Ubmwo884GbHLoyUA+xqSD0Cvify5GCv3xzB+wjB4gGdGUFdOjj</ReceiptHandle><MD5OfBody>f0cb57fa399d2c8e81f8423e93127bdc</MD5OfBody><Body>{&quot;id&quot;:&quot;1b148a0a-4a5e-4572-b28a-c31aa018351a&quot;,&quot;experienceId&quot;:&quot;0128bca1-78cf-4cb8-ac00-c07600500254&quot;,&quot;experienceName&quot;:&quot;@dsokal-local/turtle-cli-example&quot;,&quot;platform&quot;:&quot;android&quot;,&quot;config&quot;:{&quot;releaseChannel&quot;:&quot;default&quot;,&quot;buildType&quot;:&quot;apk&quot;},&quot;status&quot;:&quot;sent-to-queue&quot;,&quot;sdkVersion&quot;:&quot;37.0.0&quot;,&quot;accountId&quot;:&quot;9b473c78-6d0e-4b69-88a8-1c0960287b2f&quot;,&quot;priority&quot;:&quot;normal&quot;,&quot;credentials&quot;:{&quot;keystore&quot;:&quot;/u3+7QAAAAIAAAABAAAAAQAscWdyemIydGhiYzFzYjJuaGJjOTBkeGowYmd1dHkyeHBsd3Y0eXcxd2JndT0AAAFxTutg3AAABQEwggT9MA4GCisGAQQBKgIRAQEFAASCBOl0ClAt46XtKkD3OZ4KtYCfGvjcqn+NUvylgValp+eckKR3vpTdmzIJxCCPCPpVWUT9kssEpIWea1oyDbBoh01lSazoofkTt+QIkcnr2sOcWgoyywIH+jNH4CPDfycdjPBsy8IoFqSz5DSS9vWwdO8xw0uw/iBd0MmQUcdJANZb0HbvrOU9R1n8IeNeFZUS0nk8czYplz8e7+lWphAY1vA7oLKwYMvkPrHQSoHaXh7WqOyn3A31eQgTHZGW2vwSa7gUS+X1izYozAY5AaKrxwUYQ56dWMNnuufSGldj8KWIpdps1Bo1bN6bb/eDWiXbEGWXgwJOZxYs9OFiPPw296aBdtWpG3qu11Z+NQmr28ov0uqj9yWBX/+iO8TgyCEBPZHRnlVRvoRIvhXoZ2GYsLMvJsn7GrdPWHzzs1cKkg85Ffh7Tr1+32LkVHqHtuId/2hhC2HeP5Yzgkw45ty29H3SXWpydrDjLwQAtGYDnYxYplRxhSt+FXMsepuytDCHAjJ27Ers9mMOs8LriYznJcup32FSrdvAk8SXdrxIXmZ7q8dgmI0OD6tlS+cNGm9Y0e7kWbFbSXK72YViVWzAL/Rm0ecQPSnOaowpVsvU6vWHCdUxgwWGpJAXPPrVmvoTwzQQ4gjm6d4IvRzfW2pXMGvw+gr/19LicvUkhRLS7qKHaYS1QXss9rxWgE8SdFMJghFnwc2s+V4wDsf44aeX3/0mYegfijXI/2d6htQ4ouojQBmQlK7pKiUGjDepgT3S+G8XBSslBcTv0Vf5sudUcisXH8BQd015Sf5ruE7k0BLObfUWsJSd3b8uRjwAXkjCKILiUOckIuLwIiRNBj39u5HlrXZeuUiK736F9j9xPwVg5RGzW28gaLLSjZhJVogH6LA72aAEMbpt9155dkmzVa8RCk2P4axEknbL5V9Bq0L/7d2ouR+5MSGQf3lvxxd1qI9R+oTUDUwiJG4P/emjrJ+uXV6uBtz6fA9IrT3s8fWbBGcxToUPQCo2xfHp6VKzoV3wxelWq7LXDFHZWTw4WYbuStSBzdxNoRpmv9f+qBRA2hehildALE3Mib9zg5vPIU1byPuWNs6Tgca+Iolnkj/gCu69LbFWbcKsE34b+L840DHGFaYP455elIk3sQmYfQfP0KCqY1xmixPkT3bZQpRjWCGeemTY4hl+kGnVcvKWejOikWlAIoj3ZsjuEIxseIt3IUyLPpRFIqH1thODR+O/h3rutmWUknzvj+LlNJlDxI9heNm7i2toyY8QOvdZiUw0elS7yxL+MPTRfZfOLsV9glHYbivtwku5aRiG15DUPW+00fwOSQXq4x3D07z0QFmnoRl2IrW/113EkkJCtmNbLrWRXQkUaO5Rj4JYWIu9kc7w9GGMS3v1utQ2w8AicBqbYPMy7QnqSfok/FZVntBB/xQDoecXfMlA/G1x4WYe2/gaXjydSNSAx/ta7zbgVGU0SxNVbBs6vyuvlMqNpnHlS3wmlSkl0qGNqHuRvl1qfc5gJJ3eCTkZdqSMocVjHkutc0gja2gStLxdEGTxh12CvmSmn0vve5qWhuHi1xZxSLJutImspnXuLDKSu5tWPZsi38CAsxAR3sDZ6xe+0EuiJwK8w3R/r6Cz7rZRwYm/mg4x0BvDhkWeuvYJEtAZKCKLlumodK2gl7AAAAABAAVYLjUwOQAAA2EwggNdMIICRaADAgECAgQrux+aMA0GCSqGSIb3DQEBCwUAMF8xCzAJBgNVBAYTAlVTMQkwBwYDVQQIEwAxCTAHBgNVBAcTADEJMAcGA1UEChMAMQkwBwYDVQQLEwAxJDAiBgNVBAMTG2NvbS5leHBvLnR1cnRsZS5jbGkuZXhhbXBsZTAeFw0yMDA0MDYwOTU2MjBaFw00NzA4MjMwOTU2MLine truncated
+[{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_android_in_priority.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult><Message><MessageId>fc2fe53d-1447-4304-90e0-60b025ac9687</MessageId><ReceiptHandle>AQEBcOA9S4yhL3ZCaho9Cv+XVqJEbhOaaWJTsOvBD9SOa/NK/248s0+yI9bHro5Ti9WJrnD3H65SdK9eOETFeS/QDaaCMTYkxjvH/1DrSJt2rAptgItmxl8F6N3iDYLqplOQjmautdjCWYXrCLxMDihMHEjcvWNAq0XLAAjlQJvtm5Z8Vji5xXKJP3IpQOV2DvhS/Cqriteaqe6NW5xKwgKHOC52IVTPMSHiJ0ERUf55agntOOJJ7Za7vHdTr+Zjrxl6yVFWKC/cpwYI00OKGj4bArud0buiaD0rtjszLmcPgcwADRsmhfG65p3gLwIwjfclHqSLlmcuY3c+xsu/5VM1YA==</ReceiptHandle><MD5OfBody>c9e8a99bf73407dfa26a2cb81103c26a</MD5OfBody><Body>{&quot;id&quot;:&quot;b9f9f814-5603-4dd5-929d-c9eed756c591&quot;,&quot;experienceId&quot;:&quot;531b2db0-4b14-11e9-92d6-95aebd1034a3&quot;,&quot;experienceName&quot;:&quot;@dsokal-local/turtle-cli-example&quot;,&quot;platform&quot;:&quot;android&quot;,&quot;config&quot;:{&quot;releaseChannel&quot;:&quot;default&quot;},&quot;status&quot;:&quot;sent-to-queue&quot;,&quot;sdkVersion&quot;:&quot;32.0.0&quot;,&quot;accountId&quot;:&quot;4c44c9d8-3cb6-4980-8505-ca0637cf3165&quot;,&quot;priority&quot;:&quot;high&quot;,&quot;credentials&quot;:{&quot;keystore&quot;:&quot;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&quot;,&quot;keyPassword&quot;:&quot;fb7409988d78459c826cf2a438cb3a33&quot;,&quot;keystoreAlias&quot;:&quot;QGRzb2thbC1sb2NhbC90dXJ0bGUtY2xpLWV4YW1wbGU=&quot;,&quot;keystorePassword&quot;:&quot;80c3583b33b84a1d91e5cf33b2421d7c&quot;},&quot;manifest&quot;:{&quot;android&quot;:{&quot;package&quot;:&quot;com.expo.turtle.cli.example&quot;},&quot;bundledAssets&quot;:[&quot;asset_3a2ba31570920eeb9b1d217cabe58315.ttf&quot;,&quot;asset_744ce60078c17d86006dd0edabcd59a7.ttf&quot;,&qLine truncated

src/bin/setup/android/index.ts

@@ -101,9 +101,7 @@ async function _shellAppPostDownloadAction(sdkVersion: string, workingdir: strin
 async function _installNodeModules(cwd: string) {
   l.info(`installing dependencies in ${cwd} directory...`);
   const command = await _shouldUseYarnOrNpm();
-  // Keep in sync with /Dockerfile
-  // --prod requires --ignore-scripts (otherwise expo-yarn-workspaces errors as missing)
-  await ExponentTools.spawnAsyncThrowError(command, ['install', '--ignore-scripts', '--production'], {
+  await ExponentTools.spawnAsyncThrowError(command, ['install'], {
     pipeToLogger: true,
     loggerFields: LOGGER_FIELDS,
     cwd,

src/bin/utils/builder.ts

@@ -1,6 +1,5 @@
 import _url from 'url';
 
-import { ConfigError, getExpoSDKVersion } from '@expo/config';
 import { ExponentTools } from '@expo/xdl';
 import _ from 'lodash';
 import uuid from 'uuid';
@@ -64,22 +63,21 @@ export function createBuilderAction({
         }
       }
 
-      const projectAbsoluteDir = ProjectUtils.resolveAbsoluteDir(projectDirArg);
       const args = {
         releaseChannel: cmd.releaseChannel || 'default',
         buildType: cmd.type,
         buildMode: cmd.mode,
         username: userData.username || 'anonymous',
-        projectDir: projectAbsoluteDir,
+        projectDir: ProjectUtils.resolveAbsoluteDir(projectDirArg),
         publicUrl: cmd.publicUrl,
       };
 
       const appJSON = await ProjectUtils.loadAppJSON(projectDirArg, cmd.config);
-      const sdkVersion = getExpoSDKVersionSafely(projectAbsoluteDir, appJSON);
+      const sdkVersion = _.get(appJSON, 'expo.sdkVersion');
       await setup(platform, sdkVersion);
       const credentials = await prepareCredentials(cmd);
       const rawJob = {
-        ...await buildJobObject(platform, appJSON, args, credentials, sdkVersion),
+        ...await buildJobObject(platform, appJSON, args, credentials),
         ...cmd.buildDir && { fakeUploadDir: ProjectUtils.resolveAbsoluteDir(cmd.buildDir) },
         ...cmd.output && { fakeUploadBuildPath: ProjectUtils.resolveAbsoluteDir(cmd.output) },
       };
@@ -97,27 +95,11 @@ export function createBuilderAction({
   };
 }
 
-function getExpoSDKVersionSafely(projectDir: string, appJSON?: any) {
-  try {
-    return getExpoSDKVersion(projectDir, appJSON && appJSON.expo);
-  } catch (err) {
-    if (err instanceof ConfigError) {
-      throw new Error(
-        'Couldn\'t find the `expo` library in your project\'s dependencies.'
-        + ' Have you run \'yarn install\' or \'npm install\' for your project?',
-      );
-    } else {
-      throw err;
-    }
-  }
-}
-
 const buildJobObject = async (
   platform: 'android' | 'ios',
   appJSON: any,
   { releaseChannel, buildType, buildMode, username, publicUrl, projectDir }: any,
   credentials: any,
-  sdkVersion: string,
 ) => {
   const experienceName = `@${_.get(appJSON, 'expo.owner', username)}/${_.get(appJSON, 'expo.slug')}`;
   const job = {
@@ -133,14 +115,14 @@ const buildJobObject = async (
     id: uuid.v4(),
     platform,
     projectDir,
-    sdkVersion,
+    sdkVersion: _.get(appJSON, 'expo.sdkVersion'),
     experienceName,
     ...(credentials && { credentials }),
   };
   const url = getExperienceUrl(job.experienceName, job.config.publicUrl);
 
   const manifest = await ExponentTools.getManifestAsync(url, {
-    'Exponent-SDK-Version': sdkVersion,
+    'Exponent-SDK-Version': _.get(appJSON, 'expo.sdkVersion'),
     'Exponent-Platform': platform,
     'Expo-Release-Channel': releaseChannel,
     'Accept': 'application/expo+json,application/json',

src/jobManager.ts

@@ -10,7 +10,7 @@ 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 { getPriorities, labelConfiguration, TurtleMode } from 'turtle/utils/priorities';
+import { getPriorities } from 'turtle/utils/priorities';
 import * as redis from 'turtle/utils/redis';
 import { sanitizeJob } from 'turtle/validator';
 
@@ -22,8 +22,8 @@ function _maybeExit() {
 }
 
 export async function doJob() {
-  const { job, turtleMode } = await getJob();
-  await processJob(job, turtleMode);
+  const jobData = await getJob();
+  await processJob(jobData);
   _maybeExit();
 }
 
@@ -34,7 +34,6 @@ export async function getJob() {
     try {
       let job = null;
       const priorities = await getPriorities();
-      const turtleMode = labelConfiguration(priorities);
       for (const priority of priorities) {
         job = await sqs.receiveMessage(priority);
         _maybeExit();
@@ -45,7 +44,7 @@ export async function getJob() {
       }
       _maybeExit();
       if (job !== null) {
-        return { job, turtleMode };
+        return job;
       }
     } catch (err) {
       logger.error({ err }, 'Error at receiving messages');
@@ -53,7 +52,7 @@ export async function getJob() {
   }
 }
 
-async function processJob(jobData: any, turtleMode: TurtleMode) {
+async function processJob(jobData: any) {
   const receiptHandle = jobData.ReceiptHandle;
   const { priority } = jobData;
 
@@ -93,7 +92,7 @@ async function processJob(jobData: any, turtleMode: TurtleMode) {
       let buildFailed = false;
       const buildType = _.get(job, 'config.buildType', 'default');
       try {
-        const status = await build(job, turtleMode);
+        const status = await build(job);
         buildStatusMetric.add(buildType, priority, status);
         buildFailed = !status;
       } catch (err) {
@@ -138,7 +137,7 @@ function failAfterMaxJobTime(priority: string, receiptHandle: string, job: any)
   }, config.builder.maxJobTimeMs);
 }
 
-async function build(job: any, turtleMode: TurtleMode) {
+async function build(job: any) {
   const startTimestamp = Date.now();
   const s3Url = await logger.initForJob(job);
   const calculateBuildDuration = () => Math.ceil((Date.now() - startTimestamp) / 1000);
@@ -147,7 +146,6 @@ async function build(job: any, turtleMode: TurtleMode) {
     await sqs.sendMessage(job.id, BUILD.JOB_STATES.IN_PROGRESS, {
       logUrl: s3Url,
       logFormat: 'json',
-      turtleMode,
     });
     const result = await (builders as any)[job.platform](job);
     const buildDuration = calculateBuildDuration();

src/metrics/buildersConfig.ts

@@ -5,11 +5,11 @@ import take from 'lodash/take';
 import logger from 'turtle/logger';
 import { sendMetric } from 'turtle/metrics/datadog';
 import { getReplicaCount } from 'turtle/utils/metadata';
-import { getLabeledConfiguration, TurtleMode } from 'turtle/utils/priorities';
+import { getLabeledConfiguration, TurtleModeLabels } from 'turtle/utils/priorities';
 
 const createMetricName = () => `turtle.replicaCount`;
-const createModeMetricName = (mode: TurtleMode) => `${createMetricName()}.${mode}`;
-const createModeTag = (mode: TurtleMode) => `mode:${mode}`;
+const createModeMetricName = (mode: TurtleModeLabels) => `${createMetricName()}.${mode}`;
+const createModeTag = (mode: TurtleModeLabels) => `mode:${mode}`;
 
 export default async function sendConfigToDatadog() {
   let configuration;
@@ -30,28 +30,28 @@ export default async function sendConfigToDatadog() {
 
   const metricName = createMetricName();
 
-  const normalReplicaCount = replicaCounts[TurtleMode.Normal] || 0;
-  const highReplicaCount = replicaCounts[TurtleMode.High] || 0;
-  const highOnlyReplicaCount = replicaCounts[TurtleMode.HighOnly] || 0;
+  const normalReplicaCount = replicaCounts[TurtleModeLabels.Normal] || 0;
+  const highReplicaCount = replicaCounts[TurtleModeLabels.High] || 0;
+  const highOnlyReplicaCount = replicaCounts[TurtleModeLabels.HighOnly] || 0;
 
-  const normalTag = createModeTag(TurtleMode.Normal);
-  const normalMetricName = createModeMetricName(TurtleMode.Normal);
+  const normalTag = createModeTag(TurtleModeLabels.Normal);
+  const normalMetricName = createModeMetricName(TurtleModeLabels.Normal);
   logger.debug(
     `Sending ${metricName}=${normalReplicaCount} (${normalTag}), ${normalMetricName}=${normalReplicaCount} to Datadog`,
   );
   await sendMetric(metricName, normalReplicaCount, [normalTag]);
   await sendMetric(normalMetricName, normalReplicaCount);
 
-  const highTag = createModeTag(TurtleMode.High);
-  const highMetricName = createModeMetricName(TurtleMode.High);
+  const highTag = createModeTag(TurtleModeLabels.High);
+  const highMetricName = createModeMetricName(TurtleModeLabels.High);
   logger.debug(
     `Sending ${metricName}=${highReplicaCount} (${highTag}), ${highMetricName}=${highReplicaCount} to Datadog`,
   );
   await sendMetric(metricName, highReplicaCount, [highTag]);
   await sendMetric(highMetricName, highReplicaCount);
 
-  const highOnlyTag = createModeTag(TurtleMode.HighOnly);
-  const highOnlyMetricName = createModeMetricName(TurtleMode.HighOnly);
+  const highOnlyTag = createModeTag(TurtleModeLabels.HighOnly);
+  const highOnlyMetricName = createModeMetricName(TurtleModeLabels.HighOnly);
   logger.debug(
     `Sending ${metricName}=${highOnlyReplicaCount} (${highOnlyTag}),`
     + ` ${highOnlyMetricName}=${highOnlyReplicaCount} to Datadog`,

src/utils/priorities.ts

@@ -9,7 +9,7 @@ import { getRedisClient, RedisClient } from 'turtle/utils/redis';
 export const NORMAL = 'normalPriority';
 export const HIGH = 'highPriority';
 
-export enum TurtleMode {
+export enum TurtleModeLabels {
   Normal = 'normal',
   High = 'high',
   HighOnly = 'highOnly',
@@ -100,15 +100,13 @@ async function getConfiguration(currentRedisClient: any) {
 
 export async function getLabeledConfiguration(currentRedisClient?: any) {
   const configuration = await getConfiguration(currentRedisClient);
-  return configuration.map((i: string[]) => labelConfiguration(i));
-}
-
-export function labelConfiguration(configuration: string[]): TurtleMode {
-  if (isEqual(configuration, NORMAL_CONFIGURATION)) {
-    return TurtleMode.Normal;
-  } else if (isEqual(configuration, HIGH_CONFIGURATION)) {
-    return TurtleMode.High;
-  } else {
-    return TurtleMode.HighOnly;
-  }
+  return configuration.map((i: string[]) => {
+    if (isEqual(i, NORMAL_CONFIGURATION)) {
+      return TurtleModeLabels.Normal;
+    } else if (isEqual(i, HIGH_CONFIGURATION)) {
+      return TurtleModeLabels.High;
+    } else {
+      return TurtleModeLabels.HighOnly;
+    }
+  });
 }