Add expoCli parameter. (#409)

expo · May 14, 2021 · 2975a02 · 2975a02
1 parent f4e396d
commit 2975a02
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ This is the log of notable changes to EAS CLI and related packages.
 - Auto sync associated domains capability before building. ([#384](https://github.com/expo/eas-cli/pull/384) by [@EvanBacon](https://github.com/EvanBacon))
 - Add eas init command. [#402](https://github.com/expo/eas-cli/pull/402) by [@jkhales](https://github.com/jkhales))
 - Allow for arbitrary string values in `schemeBuildConfiguration`. ([#394](https://github.com/expo/eas-cli/pull/394) by [@randomhajile](https://github.com/randomhajile))
+- Allow for installing custom `expo-cli` version on EAS Build. ([#409](https://github.com/expo/eas-cli/pull/409) by [@randomhajile](https://github.com/randomhajile))
 
 ### 🐛 Bug fixes
 

diff --git a/packages/eas-cli/package.json b/packages/eas-cli/package.json
@@ -13,7 +13,7 @@
     "@expo/apple-utils": "0.0.0-alpha.19",
     "@expo/config": "3.3.19",
     "@expo/config-plugins": "1.0.24",
-    "@expo/eas-build-job": "0.2.31",
+    "@expo/eas-build-job": "0.2.32",
     "@expo/eas-json": "0.14.0",
     "@expo/json-file": "8.2.25",
     "@expo/pkcs12": "0.0.4",

diff --git a/packages/eas-cli/src/build/android/prepareJob.ts b/packages/eas-cli/src/build/android/prepareJob.ts
@@ -71,6 +71,7 @@ async function prepareJobCommonAsync(
       node: ctx.buildProfile.node,
       yarn: ctx.buildProfile.yarn,
       ndk: ctx.buildProfile.ndk,
+      expoCli: ctx.buildProfile.expoCli,
       env: ctx.buildProfile.env,
     },
     cache: {

diff --git a/packages/eas-cli/src/build/ios/prepareJob.ts b/packages/eas-cli/src/build/ios/prepareJob.ts
@@ -89,6 +89,7 @@ async function prepareJobCommonAsync(
       bundler: ctx.buildProfile.bundler,
       cocoapods: ctx.buildProfile.cocoapods,
       fastlane: ctx.buildProfile.fastlane,
+      expoCli: ctx.buildProfile.expoCli,
       env: ctx.buildProfile.env,
     },
     cache: {

diff --git a/packages/eas-json/package.json b/packages/eas-json/package.json
@@ -5,7 +5,7 @@
   "author": "Expo <support@expo.io>",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/eas-build-job": "0.2.31",
+    "@expo/eas-build-job": "0.2.32",
     "@hapi/joi": "17.1.1",
     "fs-extra": "9.0.1",
     "tslib": "1.14.1"

diff --git a/packages/eas-json/src/EasJsonSchema.ts b/packages/eas-json/src/EasJsonSchema.ts
@@ -16,6 +16,7 @@ const AndroidBuilderEnvironmentSchema = Joi.object({
   node: Joi.string().empty(null).custom(semverSchemaCheck),
   yarn: Joi.string().empty(null).custom(semverSchemaCheck),
   ndk: Joi.string().empty(null).custom(semverSchemaCheck),
+  expoCli: Joi.string().empty(null).custom(semverSchemaCheck),
   env: Joi.object().pattern(Joi.string(), Joi.string().empty(null)).default({}),
 });
 
@@ -28,6 +29,7 @@ const IosBuilderEnvironmentSchema = Joi.object({
   bundler: Joi.string().empty(null).custom(semverSchemaCheck),
   fastlane: Joi.string().empty(null).custom(semverSchemaCheck),
   cocoapods: Joi.string().empty(null).custom(semverSchemaCheck),
+  expoCli: Joi.string().empty(null).custom(semverSchemaCheck),
   env: Joi.object().pattern(Joi.string(), Joi.string().empty(null)).default({}),
 });
 

diff --git a/yarn.lock b/yarn.lock
@@ -1183,10 +1183,10 @@
     xcode "^3.0.0"
     xml-js "^1.6.11"
 
-"@expo/eas-build-job@0.2.31":
-  version "0.2.31"
-  resolved "https://registry.yarnpkg.com/@expo/eas-build-job/-/eas-build-job-0.2.31.tgz#151a68d6262a9b62cd0f1cab903c1583e389445e"
-  integrity sha512-JJRC+c5PGmBuB9Q/r6dEDa64xWdsI43v+dmhDuSlRbH2ItwaWfh+oKwedw9SeekTvveDwY9diNIGdjoba8dbfA==
+"@expo/eas-build-job@0.2.32":
+  version "0.2.32"
+  resolved "https://registry.yarnpkg.com/@expo/eas-build-job/-/eas-build-job-0.2.32.tgz#69ef0a15145e49cf4c24503568bdc28b4cbed58e"
+  integrity sha512-7skgicB5Voc1932NHcomCHUyW1xOnqttzEmRcdEj2v3AukIH8a13rj0JLdpyhjmuXAwoHKuHUH7PQRuivwKO3Q==
   dependencies:
     "@hapi/joi" "^17.1.1"