[eas-cli] Add support for updated fingerprint policy to eas update

2026-11-14 10:08:06 -10:00 · 2024-02-14 21:36:15 -07:00
182 changed files with 2920 additions and 9603 deletions
@@ -69,22 +69,16 @@ jobs:
      - uses: actions/setup-node@v2
        with:
          node-version: 20
-      - run: brew install python-setuptools
-        env:
-          HOMEBREW_NO_AUTO_UPDATE: 1
      - run: yarn install --frozen-lockfile --check-files
      - run: yarn build
      - name: Build tarballs
        working-directory: ${{ github.workspace }}/packages/eas-cli
        run: |
          yarn pretarball-ci
-          yarn oclif pack:tarballs --no-xz --targets darwin-x64,darwin-arm64
+          yarn oclif pack:tarballs --no-xz --targets darwin-x64
      - id: x64
        run: echo "filename=$(ls eas-*-x64.tar.gz)" >> $GITHUB_OUTPUT
        working-directory: ${{ github.workspace }}/packages/eas-cli/dist
-      - id: arm64
-        run: echo "filename=$(ls eas-*-arm64.tar.gz)" >> $GITHUB_OUTPUT
-        working-directory: ${{ github.workspace }}/packages/eas-cli/dist
      - name: Upload darwin-x64 tarball
        uses: actions/upload-release-asset@v1
        env:
@@ -94,15 +88,6 @@ jobs:
          asset_path: packages/eas-cli/dist/${{ steps.x64.outputs.filename }}
          asset_name: ${{ steps.x64.outputs.filename }}
          asset_content_type: application/gzip
-      - name: Upload darwin-arm64 tarball
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: packages/eas-cli/dist/${{ steps.arm64.outputs.filename }}
-          asset_name: ${{ steps.arm64.outputs.filename }}
-          asset_content_type: application/gzip
  build-windows:
    name: Build for Windows
    runs-on: ubuntu-latest
@@ -226,16 +211,3 @@ jobs:
          SLACK_USERNAME: 'EAS CLI CI'
          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
          SLACK_FOOTER: ''
-  open-pr-in-universe:
-    name: Open a PR with `@expo/eas-json` bump in universe
-    needs: publish-to-npm
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Open a PR with `@expo/eas-json` version bump in universe
-        uses: benc-uk/workflow-dispatch@v1
-        with:
-          repo: expo/universe
-          ref: main
-          workflow: update-eas-json.yml
-          token: ${{ secrets.EXPO_BOT_PAT }}
@@ -1,10 +0,0 @@
-{
-  "eslint.enable": true,
-  "search.exclude": {
-    "**/node_modules": true,
-    "**/bower_components": true,
-    "**/*.code-search": true,
-    "**/src/**/build/**": false,
-    "**/src/build/**": false,
-  }
-}
@@ -12,217 +12,7 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🧹 Chores

-## [9.0.7](https://github.com/expo/eas-cli/releases/tag/v9.0.7) - 2024-05-17
-
-## [9.0.6](https://github.com/expo/eas-cli/releases/tag/v9.0.6) - 2024-05-15
-
-## [9.0.5](https://github.com/expo/eas-cli/releases/tag/v9.0.5) - 2024-05-13
-
-## [9.0.4](https://github.com/expo/eas-cli/releases/tag/v9.0.4) - 2024-05-13
-
-### 🧹 Chores
-
- Add loader and progress information to the `diagnostics` command. ([#2378](https://github.com/expo/eas-cli/pull/2378) by [@simek](https://github.com/simek))
-
-## [9.0.3](https://github.com/expo/eas-cli/releases/tag/v9.0.3) - 2024-05-10
-
-### 🧹 Chores
-
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2372](https://github.com/expo/eas-cli/pull/2372) by [@expo-bot](https://github.com/expo-bot))
-
-## [9.0.2](https://github.com/expo/eas-cli/releases/tag/v9.0.2) - 2024-05-09
-
-## [9.0.1](https://github.com/expo/eas-cli/releases/tag/v9.0.1) - 2024-05-09
-
-### 🧹 Chores
-
- Update image tags in `eas.schema.json`. ([#2363](https://github.com/expo/eas-cli/pull/2363) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [9.0.0](https://github.com/expo/eas-cli/releases/tag/v9.0.0) - 2024-05-08
-
-### 🛠 Breaking changes
-
- Allow modification of provisioning profile in CI, add --freeze-credentials flag. ([#2347](https://github.com/expo/eas-cli/pull/2347) by [@quinlanj](https://github.com/quinlanj))
-
-### 🐛 Bug fixes
-
- Pass env from process.env and build profile to expo-updates CLI calls where applicable. ([#2359](https://github.com/expo/eas-cli/pull/2359) by [@wschurman](https://github.com/wschurman))
-
-### 🧹 Chores
-
- Remove more classic updates code. ([#2357](https://github.com/expo/eas-cli/pull/2357) by [@wschurman](https://github.com/wschurman))
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2360](https://github.com/expo/eas-cli/pull/2360) by [@expo-bot](https://github.com/expo-bot))
- Don't pass custom global `"expoCli"` version set in `eas.json` to EAS Build process and warn users when setting it. ([#2361](https://github.com/expo/eas-cli/pull/2361) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [8.0.0](https://github.com/expo/eas-cli/releases/tag/v8.0.0) - 2024-05-01
-
-### 🛠 Breaking changes
-
- Stop creating a channel on `eas update` and `eas update:roll-back-to-embedded` unless the `--channel` flag is specified. ([#2346](https://github.com/expo/eas-cli/pull/2346) by [@quinlanj](https://github.com/quinlanj))
-
-### 🐛 Bug fixes
-
- Improve login info message for other login options. ([#2352](https://github.com/expo/eas-cli/pull/2352) by [@wschurman](https://github.com/wschurman))
- Show the -s, --sso option in the login command help. ([#2353](https://github.com/expo/eas-cli/pull/2353) by [@lzkb](https://github.com/lzkb))
-
-### 🧹 Chores
-
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2351](https://github.com/expo/eas-cli/pull/2351) by [@expo-bot](https://github.com/expo-bot))
- Don't prompt users to set push notifications by default if they don't have the `expo-notifications` installed. ([#2343](https://github.com/expo/eas-cli/pull/2343) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [7.8.5](https://github.com/expo/eas-cli/releases/tag/v7.8.5) - 2024-04-26
-
-### 🐛 Bug fixes
-
- Add explicit workflow arg to expo-update CLI calls. ([#2340](https://github.com/expo/eas-cli/pull/2340) by [@wschurman](https://github.com/wschurman))
-
-### 🧹 Chores
-
- Improve error message if the server returns `UNAUTHORIZED_ERROR`. ([#2345](https://github.com/expo/eas-cli/pull/2345) by [@szdziedzic](https://github.com/szdziedzic))
- Fill in min expo-updates version for expo-updates CLI. ([#2344](https://github.com/expo/eas-cli/pull/2344) by [@wschurman](https://github.com/wschurman))
-
-## [7.8.4](https://github.com/expo/eas-cli/releases/tag/v7.8.4) - 2024-04-24
-
-### 🧹 Chores
-
- Update the list of available Android images. ([#2337](https://github.com/expo/eas-cli/pull/2337) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
- Make multi-select for revoking distribution certificates more readable. ([#2342](https://github.com/expo/eas-cli/pull/2342) by [@szdziedzic](https://github.com/szdziedzic))
- Improve error message displayed when EAS CLI version doesn't satisfy minimal version required specified in eas.json. ([#2341](https://github.com/expo/eas-cli/pull/2341) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [7.8.3](https://github.com/expo/eas-cli/releases/tag/v7.8.3) - 2024-04-23
-
-### 🐛 Bug fixes
-
- Don't prompt to set `android.package` and `ios.bundleIdentifier` values when running in non-interactive mode. ([#2336](https://github.com/expo/eas-cli/pull/2336) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🧹 Chores
-
- Amend credential removal wording. ([#2334](https://github.com/expo/eas-cli/pull/2334) by [@quinlanj](https://github.com/quinlanj))
-
-## [7.8.2](https://github.com/expo/eas-cli/releases/tag/v7.8.2) - 2024-04-15
-
-### 🐛 Bug fixes
-
- Fix display of errors when expo-updates CLI command fails. ([#2324](https://github.com/expo/eas-cli/pull/2324) by [@wschurman](https://github.com/wschurman))
- Move credentials endpoints to paginated counterparts. ([#2327](https://github.com/expo/eas-cli/pull/2327) by [@quinlanj](https://github.com/quinlanj))
-
-### 🧹 Chores
-
- Add progress bar for fetching paginated datasets. ([#2326](https://github.com/expo/eas-cli/pull/2326) by [@quinlanj](https://github.com/quinlanj))
-
-## [7.8.1](https://github.com/expo/eas-cli/releases/tag/v7.8.1) - 2024-04-11
-
-### 🐛 Bug fixes
-
- Fix command source files URLs in autogenerated `README`. ([#2318](https://github.com/expo/eas-cli/pull/2318) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🧹 Chores
-
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2316](https://github.com/expo/eas-cli/pull/2316) by [@expo-bot](https://github.com/expo-bot))
- Stop querying `Build.resourceClass` field. ([#2320](https://github.com/expo/eas-cli/pull/2320) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [7.8.0](https://github.com/expo/eas-cli/releases/tag/v7.8.0) - 2024-04-08
-
-### 🎉 New features
-
- Add `auto`, `sdk-50` and `sdk-49` image tags. ([#2298](https://github.com/expo/eas-cli/pull/2298) by [@szdziedzic](https://github.com/szdziedzic))
- Add `--build-logger-level` flag to `eas build` command. ([#2313](https://github.com/expo/eas-cli/pull/2313) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🧹 Chores
-
- Deprecate the `default` image tag. ([#2298](https://github.com/expo/eas-cli/pull/2298) by [@szdziedzic](https://github.com/szdziedzic))
- Deprecate iOS images with Xcode version lower then 15. ([#2298](https://github.com/expo/eas-cli/pull/2298) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [7.7.0](https://github.com/expo/eas-cli/releases/tag/v7.7.0) - 2024-04-05
-
-### 🎉 New features
-
- Generate metadata file for project archive ([#2149](https://github.com/expo/eas-cli/pull/2149) by [@khamilowicz](https://github.com/khamilowicz))
- Add --verbose-fastlane flag to eas submit command for more robust fastlane pilot logs. ([#2276](https://github.com/expo/eas-cli/pull/2276) by [@khamilowicz](https://github.com/khamilowicz))
- Add `eas credentials:configure-build` subcommand. ([#2282](https://github.com/expo/eas-cli/pull/2282) by [@fiberjw](https://github.com/fiberjw))
-
-### 🧹 Chores
-
- Add info about the Xcode 15.3 image to `eas.schema.json`. ([#2312](https://github.com/expo/eas-cli/pull/2312) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [7.6.2](https://github.com/expo/eas-cli/releases/tag/v7.6.2) - 2024-03-27
-
-### 🧹 Chores
-
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2301](https://github.com/expo/eas-cli/pull/2301) by [@expo-bot](https://github.com/expo-bot))
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2304](https://github.com/expo/eas-cli/pull/2304) by [@expo-bot](https://github.com/expo-bot))
-
-## [7.6.1](https://github.com/expo/eas-cli/releases/tag/v7.6.1) - 2024-03-25
-
-### 🧹 Chores
-
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2291](https://github.com/expo/eas-cli/pull/2291) by [@expo-bot](https://github.com/expo-bot))
- Fix asset limit punctuation. ([#2296](https://github.com/expo/eas-cli/pull/2296) by [@quinlanj](https://github.com/quinlanj))
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2293](https://github.com/expo/eas-cli/pull/2293) by [@expo-bot](https://github.com/expo-bot))
-
-## [7.6.0](https://github.com/expo/eas-cli/releases/tag/v7.6.0) - 2024-03-18
-
-### 🎉 New features
-
- Print uncommitted files in non-interactive mode if they fail the execution. ([#2288](https://github.com/expo/eas-cli/pull/2288) by [@sjchmiela](https://github.com/sjchmiela))
-
-### 🐛 Bug fixes
-
- Use a custom build config path with POSIX separator when sending data to the EAS Build server. ([#2285](https://github.com/expo/eas-cli/pull/2285) by [@szdziedzic](https://github.com/szdziedzic))
- Improve resolving vcsClient as a part of the project context. ([#2295](https://github.com/expo/eas-cli/pull/2295) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🧹 Chores
-
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2277](https://github.com/expo/eas-cli/pull/2277) by [@expo-bot](https://github.com/expo-bot))
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2283](https://github.com/expo/eas-cli/pull/2283) by [@expo-bot](https://github.com/expo-bot))
- Bump the `@expo/apple-utils` version to switch between the `developer.apple.com` and `developer-mdn.apple.com` domains when one of them doesn't work. ([#2290](https://github.com/expo/eas-cli/pull/2290) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [7.5.0](https://github.com/expo/eas-cli/releases/tag/v7.5.0) - 2024-03-11
-
-### 🎉 New features
-
- Add `--auto-submit` option to `eas build:internal` command. ([#2271](https://github.com/expo/eas-cli/pull/2271) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🧹 Chores
-
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2274](https://github.com/expo/eas-cli/pull/2274) by [@expo-bot](https://github.com/expo-bot))
-
-## [7.4.0](https://github.com/expo/eas-cli/releases/tag/v7.4.0) - 2024-03-10
-
-### 🎉 New features
-
- Use new expo-updates configuration:syncnative for versioned native sync. ([#2269](https://github.com/expo/eas-cli/pull/2269) by [@wschurman](https://github.com/wschurman))
-
-### 🐛 Bug fixes
-
- Fix expo-updates package version detection for canaries. ([#2243](https://github.com/expo/eas-cli/pull/2243) by [@wschurman](https://github.com/wschurman))
- Add missing `config` property to `eas.json` schema. ([#2248](https://github.com/expo/eas-cli/pull/2248) by [@sjchmiela](https://github.com/sjchmiela))
- Use expo-updates runtime version CLI to generate runtime versions. ([#2251](https://github.com/expo/eas-cli/pull/2251) by [@wschurman](https://github.com/wschurman))
- Update @expo/apple-utils to handle changes in API. ([73ba19de6662763cc6bff9fac6b7700ffbd0e88a](https://github.com/expo/eas-cli/commit/73ba19de6662763cc6bff9fac6b7700ffbd0e88a) by [@brentvatne](https://github.com/brentvatne))
-
-### 🧹 Chores
-
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2237](https://github.com/expo/eas-cli/pull/2237) by [@expo-bot](https://github.com/expo-bot))
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2240](https://github.com/expo/eas-cli/pull/2240) by [@expo-bot](https://github.com/expo-bot))
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2253](https://github.com/expo/eas-cli/pull/2253) by [@expo-bot](https://github.com/expo-bot))
- Include src/\*\*/build directories in vscode search and replace. ([#2250](https://github.com/expo/eas-cli/pull/2250) by [@wschurman](https://github.com/wschurman))
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2259](https://github.com/expo/eas-cli/pull/2259) by [@expo-bot](https://github.com/expo-bot))
-
-## [7.3.0](https://github.com/expo/eas-cli/releases/tag/v7.3.0) - 2024-02-19
-
-### 🎉 New features
-
- Fix expo-updates fingerprinting during update. ([#2231](https://github.com/expo/eas-cli/pull/2231) by [@wschurman](https://github.com/wschurman))
-
-### 🐛 Bug fixes
-
- Don't require expo on fresh react-native project. ([#2235](https://github.com/expo/eas-cli/pull/2235) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
-
-### 🧹 Chores
-
 - Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2229](https://github.com/expo/eas-cli/pull/2229) by [@expo-bot](https://github.com/expo-bot))
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2230](https://github.com/expo/eas-cli/pull/2230) by [@expo-bot](https://github.com/expo-bot))
- Reword update configuration warning. ([#2234](https://github.com/expo/eas-cli/pull/2234) by [@quinlanj](https://github.com/quinlanj))

 ## [7.2.0](https://github.com/expo/eas-cli/releases/tag/v7.2.0) - 2024-02-11

@@ -1,5 +1,5 @@
 {
  "npmClient": "yarn",
-  "version": "9.0.7",
+  "version": "7.2.0",
  "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }
@@ -85,7 +85,6 @@ eas --help COMMAND
 * [`eas channel:view [NAME]`](#eas-channelview-name)
 * [`eas config`](#eas-config)
 * [`eas credentials`](#eas-credentials)
-* [`eas credentials:configure-build`](#eas-credentialsconfigure-build)
 * [`eas device:create`](#eas-devicecreate)
 * [`eas device:delete`](#eas-devicedelete)
 * [`eas device:list`](#eas-devicelist)
@@ -128,10 +127,7 @@ log in with your Expo account

 ```
 USAGE
-  $ eas account:login [-s]
-
-FLAGS
-  -s, --sso  Login with SSO
+  $ eas account:login

 DESCRIPTION
  log in with your Expo account
@@ -140,7 +136,7 @@ ALIASES
  $ eas login
 ```

-_See code: [packages/eas-cli/src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/account/login.ts)_
+_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/account/login.ts)_

 ## `eas account:logout`

@@ -157,7 +153,7 @@ ALIASES
  $ eas logout
 ```

-_See code: [packages/eas-cli/src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/account/logout.ts)_
+_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/account/logout.ts)_

 ## `eas account:view`

@@ -174,7 +170,7 @@ ALIASES
  $ eas whoami
 ```

-_See code: [packages/eas-cli/src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/account/view.ts)_
+_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/account/view.ts)_

 ## `eas analytics [STATUS]`

@@ -188,7 +184,7 @@ DESCRIPTION
  display or change analytics settings
 ```

-_See code: [packages/eas-cli/src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/analytics.ts)_
+_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/analytics.ts)_

 ## `eas autocomplete [SHELL]`

@@ -219,7 +215,7 @@ EXAMPLES
  $ eas autocomplete --refresh-cache
 ```

-_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v2.3.10/packages/eas-cli/src/commands/autocomplete/index.ts)_
+_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v2.3.10/src/commands/autocomplete/index.ts)_

 ## `eas branch:create [NAME]`

@@ -240,7 +236,7 @@ DESCRIPTION
  create a branch
 ```

-_See code: [packages/eas-cli/src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/branch/create.ts)_
+_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/branch/create.ts)_

 ## `eas branch:delete [NAME]`

@@ -261,7 +257,7 @@ DESCRIPTION
  delete a branch
 ```

-_See code: [packages/eas-cli/src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/branch/delete.ts)_
+_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/branch/delete.ts)_

 ## `eas branch:list`

@@ -281,7 +277,7 @@ DESCRIPTION
  list all branches
 ```

-_See code: [packages/eas-cli/src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/branch/list.ts)_
+_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/branch/list.ts)_

 ## `eas branch:rename`

@@ -301,7 +297,7 @@ DESCRIPTION
  rename a branch
 ```

-_See code: [packages/eas-cli/src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/branch/rename.ts)_
+_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/branch/rename.ts)_

 ## `eas branch:view [NAME]`

@@ -324,7 +320,7 @@ DESCRIPTION
  view a branch
 ```

-_See code: [packages/eas-cli/src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/branch/view.ts)_
+_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/branch/view.ts)_

 ## `eas build`

@@ -333,35 +329,28 @@ start a build
 ```
 USAGE
  $ eas build [-p android|ios|all] [-e <value>] [--local] [--output <value>] [--wait] [--clear-cache]
-    [--auto-submit | --auto-submit-with-profile <value>] [-m <value>] [--build-logger-level
-    trace|debug|info|warn|error|fatal] [--freeze-credentials] [--json --non-interactive]
+    [--auto-submit | --auto-submit-with-profile <value>] [-m <value>] [--json --non-interactive]

 FLAGS
-  -e, --profile=PROFILE_NAME                                Name of the build profile from eas.json. Defaults to
-                                                            "production" if defined in eas.json.
-  -m, --message=<value>                                     A short message describing the build
+  -e, --profile=PROFILE_NAME               Name of the build profile from eas.json. Defaults to "production" if defined
+                                           in eas.json.
+  -m, --message=<value>                    A short message describing the build
  -p, --platform=(android|ios|all)
-  --auto-submit                                             Submit on build complete using the submit profile with the
-                                                            same name as the build profile
-  --auto-submit-with-profile=PROFILE_NAME                   Submit on build complete using the submit profile with
-                                                            provided name
-  --build-logger-level=(trace|debug|info|warn|error|fatal)  The level of logs to output during the build process.
-                                                            Defaults to "info".
-  --clear-cache                                             Clear cache before the build
-  --freeze-credentials                                      Prevent the build from updating credentials in
-                                                            non-interactive mode
-  --json                                                    Enable JSON output, non-JSON messages will be printed to
-                                                            stderr.
-  --local                                                   Run build locally [experimental]
-  --non-interactive                                         Run the command in non-interactive mode.
-  --output=<value>                                          Output path for local build
-  --[no-]wait                                               Wait for build(s) to complete
+  --auto-submit                            Submit on build complete using the submit profile with the same name as the
+                                           build profile
+  --auto-submit-with-profile=PROFILE_NAME  Submit on build complete using the submit profile with provided name
+  --clear-cache                            Clear cache before the build
+  --json                                   Enable JSON output, non-JSON messages will be printed to stderr.
+  --local                                  Run build locally [experimental]
+  --non-interactive                        Run the command in non-interactive mode.
+  --output=<value>                         Output path for local build
+  --[no-]wait                              Wait for build(s) to complete

 DESCRIPTION
  start a build
 ```

-_See code: [packages/eas-cli/src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/build/index.ts)_
+_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/index.ts)_

 ## `eas build:cancel [BUILD_ID]`

@@ -380,7 +369,7 @@ DESCRIPTION
  cancel a build
 ```

-_See code: [packages/eas-cli/src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/build/cancel.ts)_
+_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/cancel.ts)_

 ## `eas build:configure`

@@ -397,7 +386,7 @@ DESCRIPTION
  configure the project to support EAS Build
 ```

-_See code: [packages/eas-cli/src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/build/configure.ts)_
+_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/configure.ts)_

 ## `eas build:delete [BUILD_ID]`

@@ -416,7 +405,7 @@ DESCRIPTION
  delete a build
 ```

-_See code: [packages/eas-cli/src/commands/build/delete.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/build/delete.ts)_
+_See code: [src/commands/build/delete.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/delete.ts)_

 ## `eas build:inspect`

@@ -451,7 +440,7 @@ DESCRIPTION
  inspect the state of the project at specific build stages, useful for troubleshooting
 ```

-_See code: [packages/eas-cli/src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/build/inspect.ts)_
+_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/inspect.ts)_

 ## `eas build:list`

@@ -492,7 +481,7 @@ DESCRIPTION
  list all builds for your project
 ```

-_See code: [packages/eas-cli/src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/build/list.ts)_
+_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/list.ts)_

 ## `eas build:resign`

@@ -518,7 +507,7 @@ DESCRIPTION
  re-sign a build archive
 ```

-_See code: [packages/eas-cli/src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/build/resign.ts)_
+_See code: [src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/resign.ts)_

 ## `eas build:run`

@@ -544,7 +533,7 @@ DESCRIPTION
  run simulator/emulator builds from eas-cli
 ```

-_See code: [packages/eas-cli/src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/build/run.ts)_
+_See code: [src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/run.ts)_

 ## `eas build:submit`

@@ -553,7 +542,7 @@ submit app binary to App Store and/or Play Store
 ```
 USAGE
  $ eas build:submit [-p android|ios|all] [-e <value>] [--latest | --id <value> | --path <value> | --url <value>]
-    [--verbose] [--wait] [--verbose-fastlane] [--non-interactive]
+    [--verbose] [--wait] [--non-interactive]

 FLAGS
  -e, --profile=<value>             Name of the submit profile from eas.json. Defaults to "production" if defined in
@@ -565,7 +554,6 @@ FLAGS
  --path=<value>                    Path to the .apk/.aab/.ipa file
  --url=<value>                     App archive url
  --verbose                         Always print logs from EAS Submit
-  --verbose-fastlane                Enable verbose logging for the submission process
  --[no-]wait                       Wait for submission to complete

 DESCRIPTION
@@ -594,7 +582,7 @@ DESCRIPTION
  get the latest version from EAS servers
 ```

-_See code: [packages/eas-cli/src/commands/build/version/get.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/build/version/get.ts)_
+_See code: [src/commands/build/version/get.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/version/get.ts)_

 ## `eas build:version:set`

@@ -613,7 +601,7 @@ DESCRIPTION
  update version of an app
 ```

-_See code: [packages/eas-cli/src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/build/version/set.ts)_
+_See code: [src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/version/set.ts)_

 ## `eas build:version:sync`

@@ -632,7 +620,7 @@ DESCRIPTION
  update a version in native code with a value stored on EAS servers
 ```

-_See code: [packages/eas-cli/src/commands/build/version/sync.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/build/version/sync.ts)_
+_See code: [src/commands/build/version/sync.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/version/sync.ts)_

 ## `eas build:view [BUILD_ID]`

@@ -649,7 +637,7 @@ DESCRIPTION
  view a build for your project
 ```

-_See code: [packages/eas-cli/src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/build/view.ts)_
+_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/view.ts)_

 ## `eas channel:create [NAME]`

@@ -670,7 +658,7 @@ DESCRIPTION
  create a channel
 ```

-_See code: [packages/eas-cli/src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/channel/create.ts)_
+_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/channel/create.ts)_

 ## `eas channel:edit [NAME]`

@@ -692,7 +680,7 @@ DESCRIPTION
  point a channel at a new branch
 ```

-_See code: [packages/eas-cli/src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/channel/edit.ts)_
+_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/channel/edit.ts)_

 ## `eas channel:list`

@@ -712,7 +700,7 @@ DESCRIPTION
  list all channels
 ```

-_See code: [packages/eas-cli/src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/channel/list.ts)_
+_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/channel/list.ts)_

 ## `eas channel:rollout [CHANNEL]`

@@ -744,7 +732,7 @@ DESCRIPTION
  Roll a new branch out on a channel incrementally.
 ```

-_See code: [packages/eas-cli/src/commands/channel/rollout.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/channel/rollout.ts)_
+_See code: [src/commands/channel/rollout.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/channel/rollout.ts)_

 ## `eas channel:view [NAME]`

@@ -767,7 +755,7 @@ DESCRIPTION
  view a channel
 ```

-_See code: [packages/eas-cli/src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/channel/view.ts)_
+_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/channel/view.ts)_

 ## `eas config`

@@ -788,7 +776,7 @@ DESCRIPTION
  display project configuration (app.json + eas.json)
 ```

-_See code: [packages/eas-cli/src/commands/config.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/config.ts)_

 ## `eas credentials`

@@ -805,25 +793,7 @@ DESCRIPTION
  manage credentials
 ```

-_See code: [packages/eas-cli/src/commands/credentials/index.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/credentials/index.ts)_
-
-## `eas credentials:configure-build`
-
-Set up credentials for building your project.
-
-```
-USAGE
-  $ eas credentials:configure-build [-p android|ios] [-e <value>]
-
-FLAGS
-  -e, --profile=PROFILE_NAME    The name of the build profile in eas.json.
-  -p, --platform=(android|ios)
-
-DESCRIPTION
-  Set up credentials for building your project.
-```
-
-_See code: [packages/eas-cli/src/commands/credentials/configure-build.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/credentials/configure-build.ts)_
+_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/credentials.ts)_

 ## `eas device:create`

@@ -837,7 +807,7 @@ DESCRIPTION
  register new Apple Devices to use for internal distribution
 ```

-_See code: [packages/eas-cli/src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/device/create.ts)_
+_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/device/create.ts)_

 ## `eas device:delete`

@@ -857,7 +827,7 @@ DESCRIPTION
  remove a registered device from your account
 ```

-_See code: [packages/eas-cli/src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/device/delete.ts)_
+_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/device/delete.ts)_

 ## `eas device:list`

@@ -878,7 +848,7 @@ DESCRIPTION
  list all registered devices for your account
 ```

-_See code: [packages/eas-cli/src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/device/list.ts)_
+_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/device/list.ts)_

 ## `eas device:rename`

@@ -899,7 +869,7 @@ DESCRIPTION
  rename a registered device
 ```

-_See code: [packages/eas-cli/src/commands/device/rename.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/device/rename.ts)_
+_See code: [src/commands/device/rename.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/device/rename.ts)_

 ## `eas device:view [UDID]`

@@ -913,7 +883,7 @@ DESCRIPTION
  view a device for your project
 ```

-_See code: [packages/eas-cli/src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/device/view.ts)_
+_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/device/view.ts)_

 ## `eas diagnostics`

@@ -927,7 +897,7 @@ DESCRIPTION
  display environment info
 ```

-_See code: [packages/eas-cli/src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/diagnostics.ts)_
+_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/diagnostics.ts)_

 ## `eas help [COMMAND]`

@@ -947,7 +917,7 @@ DESCRIPTION
  Display help for eas.
 ```

-_See code: [@expo/plugin-help](https://github.com/expo/oclif-plugin-help/blob/v5.1.23/packages/eas-cli/src/commands/help.ts)_
+_See code: [@expo/plugin-help](https://github.com/expo/oclif-plugin-help/blob/v5.1.23/src/commands/help.ts)_

 ## `eas init`

@@ -975,10 +945,7 @@ log in with your Expo account

 ```
 USAGE
-  $ eas login [-s]
-
-FLAGS
-  -s, --sso  Login with SSO
+  $ eas login

 DESCRIPTION
  log in with your Expo account
@@ -1018,7 +985,7 @@ DESCRIPTION
  validate the local store configuration
 ```

-_See code: [packages/eas-cli/src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/metadata/lint.ts)_
+_See code: [src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/metadata/lint.ts)_

 ## `eas metadata:pull`

@@ -1035,7 +1002,7 @@ DESCRIPTION
  generate the local store configuration from the app stores
 ```

-_See code: [packages/eas-cli/src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/metadata/pull.ts)_
+_See code: [src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/metadata/pull.ts)_

 ## `eas metadata:push`

@@ -1052,7 +1019,7 @@ DESCRIPTION
  sync the local store configuration to the app stores
 ```

-_See code: [packages/eas-cli/src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/metadata/push.ts)_
+_See code: [src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/metadata/push.ts)_

 ## `eas open`

@@ -1066,7 +1033,7 @@ DESCRIPTION
  open the project page in a web browser
 ```

-_See code: [packages/eas-cli/src/commands/open.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/open.ts)_
+_See code: [src/commands/open.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/open.ts)_

 ## `eas project:info`

@@ -1080,7 +1047,7 @@ DESCRIPTION
  information about the current project
 ```

-_See code: [packages/eas-cli/src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/project/info.ts)_
+_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/project/info.ts)_

 ## `eas project:init`

@@ -1102,7 +1069,7 @@ ALIASES
  $ eas init
 ```

-_See code: [packages/eas-cli/src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/project/init.ts)_
+_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/project/init.ts)_

 ## `eas secret:create`

@@ -1125,7 +1092,7 @@ DESCRIPTION
  create an environment secret on the current project or owner account
 ```

-_See code: [packages/eas-cli/src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/secret/create.ts)_
+_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/secret/create.ts)_

 ## `eas secret:delete`

@@ -1143,7 +1110,7 @@ DESCRIPTION
  delete an environment secret by ID
 ```

-_See code: [packages/eas-cli/src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/secret/delete.ts)_
+_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/secret/delete.ts)_

 ## `eas secret:list`

@@ -1157,7 +1124,7 @@ DESCRIPTION
  list environment secrets available for your current app
 ```

-_See code: [packages/eas-cli/src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/secret/list.ts)_
+_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/secret/list.ts)_

 ## `eas secret:push`

@@ -1177,7 +1144,7 @@ DESCRIPTION
  read environment secrets from env file and store on the server
 ```

-_See code: [packages/eas-cli/src/commands/secret/push.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/secret/push.ts)_
+_See code: [src/commands/secret/push.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/secret/push.ts)_

 ## `eas submit`

@@ -1186,7 +1153,7 @@ submit app binary to App Store and/or Play Store
 ```
 USAGE
  $ eas submit [-p android|ios|all] [-e <value>] [--latest | --id <value> | --path <value> | --url <value>]
-    [--verbose] [--wait] [--verbose-fastlane] [--non-interactive]
+    [--verbose] [--wait] [--non-interactive]

 FLAGS
  -e, --profile=<value>             Name of the submit profile from eas.json. Defaults to "production" if defined in
@@ -1198,7 +1165,6 @@ FLAGS
  --path=<value>                    Path to the .apk/.aab/.ipa file
  --url=<value>                     App archive url
  --verbose                         Always print logs from EAS Submit
-  --verbose-fastlane                Enable verbose logging for the submission process
  --[no-]wait                       Wait for submission to complete

 DESCRIPTION
@@ -1208,7 +1174,7 @@ ALIASES
  $ eas build:submit
 ```

-_See code: [packages/eas-cli/src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/submit.ts)_
+_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/submit.ts)_

 ## `eas update`

@@ -1241,7 +1207,7 @@ DESCRIPTION
  publish an update group
 ```

-_See code: [packages/eas-cli/src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/update/index.ts)_
+_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/index.ts)_

 ## `eas update:configure`

@@ -1259,7 +1225,7 @@ DESCRIPTION
  configure the project to support EAS Update
 ```

-_See code: [packages/eas-cli/src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/update/configure.ts)_
+_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/configure.ts)_

 ## `eas update:delete GROUPID`

@@ -1280,7 +1246,7 @@ DESCRIPTION
  delete all the updates in an update group
 ```

-_See code: [packages/eas-cli/src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/update/delete.ts)_
+_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/delete.ts)_

 ## `eas update:list`

@@ -1302,7 +1268,7 @@ DESCRIPTION
  view the recent updates
 ```

-_See code: [packages/eas-cli/src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/update/list.ts)_
+_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/list.ts)_

 ## `eas update:republish`

@@ -1329,7 +1295,7 @@ DESCRIPTION
  roll back to an existing update
 ```

-_See code: [packages/eas-cli/src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/update/republish.ts)_
+_See code: [src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/republish.ts)_

 ## `eas update:roll-back-to-embedded`

@@ -1356,7 +1322,7 @@ DESCRIPTION
  roll back to the embedded update
 ```

-_See code: [packages/eas-cli/src/commands/update/roll-back-to-embedded.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/update/roll-back-to-embedded.ts)_
+_See code: [src/commands/update/roll-back-to-embedded.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/roll-back-to-embedded.ts)_

 ## `eas update:rollback`

@@ -1375,7 +1341,7 @@ DESCRIPTION
  roll back to an embedded update or an existing update
 ```

-_See code: [packages/eas-cli/src/commands/update/rollback.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/update/rollback.ts)_
+_See code: [src/commands/update/rollback.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/rollback.ts)_

 ## `eas update:view GROUPID`

@@ -1395,7 +1361,7 @@ DESCRIPTION
  update group details
 ```

-_See code: [packages/eas-cli/src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/update/view.ts)_
+_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/view.ts)_

 ## `eas webhook:create`

@@ -1416,7 +1382,7 @@ DESCRIPTION
  create a webhook
 ```

-_See code: [packages/eas-cli/src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/webhook/create.ts)_
+_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/webhook/create.ts)_

 ## `eas webhook:delete [ID]`

@@ -1436,7 +1402,7 @@ DESCRIPTION
  delete a webhook
 ```

-_See code: [packages/eas-cli/src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/webhook/delete.ts)_
+_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/webhook/delete.ts)_

 ## `eas webhook:list`

@@ -1454,7 +1420,7 @@ DESCRIPTION
  list webhooks
 ```

-_See code: [packages/eas-cli/src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/webhook/list.ts)_
+_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/webhook/list.ts)_

 ## `eas webhook:update`

@@ -1476,7 +1442,7 @@ DESCRIPTION
  update a webhook
 ```

-_See code: [packages/eas-cli/src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/webhook/update.ts)_
+_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/webhook/update.ts)_

 ## `eas webhook:view ID`

@@ -1493,7 +1459,7 @@ DESCRIPTION
  view a webhook
 ```

-_See code: [packages/eas-cli/src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v9.0.7/packages/eas-cli/src/commands/webhook/view.ts)_
+_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/webhook/view.ts)_

 ## `eas whoami`

@@ -1,22 +1,22 @@
 {
  "name": "eas-cli",
  "description": "EAS command line tool",
-  "version": "9.0.7",
+  "version": "7.2.0",
  "author": "Expo <[email protected]>",
  "bin": {
    "eas": "./bin/run"
  },
  "bugs": "https://github.com/expo/eas-cli/issues",
  "dependencies": {
-    "@expo/apple-utils": "1.7.0",
+    "@expo/apple-utils": "1.4.0",
    "@expo/code-signing-certificates": "0.0.5",
    "@expo/config": "8.5.4",
    "@expo/config-plugins": "7.8.4",
    "@expo/config-types": "50.0.0",
-    "@expo/eas-build-job": "1.0.108",
-    "@expo/eas-json": "9.0.4",
+    "@expo/eas-build-job": "1.0.70",
+    "@expo/eas-json": "7.1.3",
+    "@expo/fingerprint": "0.6.0",
    "@expo/json-file": "8.2.37",
-    "@expo/logger": "1.0.57",
    "@expo/multipart-body-parser": "1.1.0",
    "@expo/osascript": "2.0.33",
    "@expo/package-manager": "1.1.2",
@@ -28,7 +28,7 @@
    "@expo/results": "1.0.0",
    "@expo/rudder-sdk-node": "1.1.1",
    "@expo/spawn-async": "1.7.0",
-    "@expo/steps": "1.0.108",
+    "@expo/steps": "1.0.70",
    "@expo/timeago.js": "1.0.0",
    "@oclif/core": "^1.26.2",
    "@oclif/plugin-autocomplete": "^2.3.10",
@@ -77,7 +77,7 @@
    "resolve-from": "5.0.0",
    "semver": "7.5.4",
    "slash": "3.0.0",
-    "tar": "6.2.1",
+    "tar": "6.2.0",
    "terminal-link": "2.1.1",
    "tslib": "2.6.2",
    "turndown": "7.1.2",
@@ -110,7 +110,7 @@
    "@types/wrap-ansi": "3.0.0",
    "axios": "0.27.2",
    "eslint-plugin-graphql": "4.0.0",
-    "express": "4.19.2",
+    "express": "4.18.2",
    "memfs": "3.4.13",
    "mockdate": "3.0.5",
    "nock": "13.4.0",
@@ -3,7 +3,8 @@ const fs = require('fs/promises');
 (async () => {
  // Patch `oclif readme` path and link generation
  let readmeContent = await fs.readFile('README.md', 'utf8');
-  readmeContent = readmeContent.replace(/src\/commands/g, 'packages/eas-cli/src/commands');
+  readmeContent = readmeContent.replace(/\[build\//g, '[src/');
+  readmeContent = readmeContent.replace(/build\/commands/g, 'packages/eas-cli/src/commands');
  await fs.writeFile('README.md', readmeContent);

  // eslint-disable-next-line no-console
@@ -24,7 +24,6 @@ export function getMockAppFragment(): AppFragment {
  return {
    id: mockProjectId,
    slug: 'testapp',
-    name: 'testapp',
    fullName: '@testuser/testpp',
    ownerAccount: {
      id: 'test-account-id',
@@ -3,7 +3,13 @@ import { v4 as uuid } from 'uuid';

 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { selectBuildToCancelAsync } from '../../commands/build/cancel';
-import { AppPlatform, BuildFragment, BuildPriority, BuildStatus } from '../../graphql/generated';
+import {
+  AppPlatform,
+  BuildFragment,
+  BuildPriority,
+  BuildResourceClass,
+  BuildStatus,
+} from '../../graphql/generated';
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import { confirmAsync, selectAsync } from '../../prompts';

@@ -85,6 +91,7 @@ function createMockBuildFragment({
      },
    },
    status: BuildStatus.InQueue,
+    resourceClass: BuildResourceClass.AndroidMedium,
    isForIosSimulator: false,
  };
 }
@@ -3,7 +3,13 @@ import { v4 as uuid } from 'uuid';

 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { selectBuildToDeleteAsync } from '../../commands/build/delete';
-import { AppPlatform, BuildFragment, BuildPriority, BuildStatus } from '../../graphql/generated';
+import {
+  AppPlatform,
+  BuildFragment,
+  BuildPriority,
+  BuildResourceClass,
+  BuildStatus,
+} from '../../graphql/generated';
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import { confirmAsync, selectAsync } from '../../prompts';

@@ -85,6 +91,7 @@ function createMockBuildFragment({
      },
    },
    status: BuildStatus.InQueue,
+    resourceClass: BuildResourceClass.AndroidMedium,
    isForIosSimulator: false,
  };
 }
@@ -8,7 +8,7 @@ import os from 'os';
 import path from 'path';

 import { getAppBuildGradleAsync, resolveConfigValue } from '../../../project/android/gradleUtils';
-import { resolveVcsClient } from '../../../vcs';
+import { getVcsClient } from '../../../vcs';
 import {
  BumpStrategy,
  bumpVersionAsync,
@@ -19,7 +19,7 @@ import {
 const fsReal = jest.requireActual('fs').promises as typeof fs;
 jest.mock('fs');

-const vcsClient = resolveVcsClient();
+const vcsClient = getVcsClient();

 afterAll(async () => {
  // do not remove the following line
@@ -1,4 +1,4 @@
-import { Android, Metadata, Platform, Workflow } from '@expo/eas-build-job';
+import { Android, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
 import { AppVersionSource } from '@expo/eas-json';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
@@ -107,13 +107,12 @@ export async function prepareAndroidBuildAsync(
            ? false
            : ctx.buildProfile.autoIncrement,
        vcsClient: ctx.vcsClient,
-        env: ctx.buildProfile.env,
      });
    },
    prepareJobAsync: async (
      ctx: BuildContext<Platform.ANDROID>,
      jobData: JobData<AndroidCredentials>
-    ): Promise<Android.Job> => {
+    ): Promise<Job> => {
      return await prepareJobAsync(ctx, jobData);
    },
    sendBuildRequestAsync: async (
@@ -2,7 +2,6 @@ import { Android } from '@expo/eas-build-job';

 import { AndroidBuildType, AndroidJobInput } from '../../graphql/generated';
 import {
-  loggerLevelToGraphQLWorkerLoggerLevel,
  transformBuildMode,
  transformBuildTrigger,
  transformProjectArchive,
@@ -15,6 +14,7 @@ export function transformJob(job: Android.Job): AndroidJobInput {
    triggeredBy: transformBuildTrigger(job.triggeredBy),
    projectArchive: transformProjectArchive(job.projectArchive),
    projectRootDirectory: job.projectRootDirectory,
+    releaseChannel: job.releaseChannel,
    updates: job.updates,
    secrets: job.secrets,
    builderEnvironment: job.builderEnvironment,
@@ -29,9 +29,6 @@ export function transformJob(job: Android.Job): AndroidJobInput {
    experimental: job.experimental,
    mode: transformBuildMode(job.mode),
    customBuildConfig: job.customBuildConfig,
-    loggerLevel: job.loggerLevel
-      ? loggerLevelToGraphQLWorkerLoggerLevel[job.loggerLevel]
-      : undefined,
  };
 }

@@ -3,15 +3,16 @@ import {
  ArchiveSource,
  BuildMode,
  BuildTrigger,
+  Job,
  Platform,
-  sanitizeBuildJob,
+  sanitizeJob,
 } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
 import path from 'path';
 import slash from 'slash';

 import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider';
-import { getCustomBuildConfigPathForJob } from '../../project/customBuildConfig';
+import { getCustomBuildConfigPath } from '../../project/customBuildConfig';
 import { getUsername } from '../../project/projectUtils';
 import { BuildContext } from '../context';

@@ -28,7 +29,7 @@ const cacheDefaults = {
 export async function prepareJobAsync(
  ctx: BuildContext<Platform.ANDROID>,
  jobData: JobData
-): Promise<Android.Job> {
+): Promise<Job> {
  const username = getUsername(ctx.exp, ctx.user);
  const buildProfile: BuildProfile<Platform.ANDROID> = ctx.buildProfile;
  const projectRootDirectory =
@@ -53,7 +54,7 @@ export async function prepareJobAsync(
  }

  const maybeCustomBuildConfigPath = buildProfile.config
-    ? getCustomBuildConfigPathForJob(buildProfile.config)
+    ? getCustomBuildConfigPath(buildProfile.config)
    : undefined;

  const job: Android.Job = {
@@ -68,6 +69,7 @@ export async function prepareJobAsync(
      bun: buildProfile.bun,
      yarn: buildProfile.yarn,
      ndk: buildProfile.ndk,
+      expoCli: buildProfile.expoCli,
      env: buildProfile.env,
    },
    cache: {
@@ -78,6 +80,7 @@ export async function prepareJobAsync(
    secrets: {
      ...buildCredentials,
    },
+    releaseChannel: buildProfile.releaseChannel,
    updates: { channel: buildProfile.channel },
    developmentClient: buildProfile.developmentClient,
    gradleCommand: buildProfile.gradleCommand,
@@ -93,20 +96,14 @@ export async function prepareJobAsync(
    experimental: {
      prebuildCommand: buildProfile.prebuildCommand,
    },
-    mode: buildProfile.config || ctx.repack ? BuildMode.CUSTOM : BuildMode.BUILD,
+    mode: buildProfile.config ? BuildMode.CUSTOM : BuildMode.BUILD,
    triggeredBy: BuildTrigger.EAS_CLI,
    ...(maybeCustomBuildConfigPath && {
      customBuildConfig: {
        path: maybeCustomBuildConfigPath,
      },
    }),
-    ...(ctx.repack && {
-      customBuildConfig: {
-        path: '__eas/repack.yml',
-      },
-    }),
-    loggerLevel: ctx.loggerLevel,
  };

-  return sanitizeBuildJob(job) as Android.Job;
+  return sanitizeJob(job);
 }
@@ -1,6 +1,6 @@
 import { ExpoConfig } from '@expo/config';
 import { AndroidConfig } from '@expo/config-plugins';
-import { Env, Platform, Workflow } from '@expo/eas-build-job';
+import { Platform, Workflow } from '@expo/eas-build-job';
 import { AndroidVersionAutoIncrement } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';
@@ -18,21 +18,21 @@ export async function syncProjectConfigurationAsync({
  exp,
  localAutoIncrement,
  vcsClient,
-  env,
 }: {
  projectDir: string;
  exp: ExpoConfig;
  localAutoIncrement?: AndroidVersionAutoIncrement;
  vcsClient: Client;
-  env: Env | undefined;
 }): Promise<void> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient, {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+  });
  const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement ?? false);

  if (workflow === Workflow.GENERIC) {
    await cleanUpOldEasBuildGradleScriptAsync(projectDir);
    if (isExpoUpdatesInstalled(projectDir)) {
-      await syncUpdatesConfigurationAsync({ projectDir, exp, workflow, env });
+      await syncUpdatesConfigurationAsync(projectDir, exp);
    }
    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
  } else {
@@ -100,7 +100,9 @@ export async function maybeResolveVersionsAsync(
  buildProfile: BuildProfile<Platform.ANDROID>,
  vcsClient: Client
 ): Promise<{ appVersion?: string; appBuildVersion?: string }> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient, {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+  });
  if (workflow === Workflow.GENERIC) {
    const buildGradle = await getAppBuildGradleAsync(projectDir);
    try {
@@ -1,10 +1,4 @@
-import {
-  ArchiveSource,
-  ArchiveSourceType,
-  BuildJob,
-  Metadata,
-  Platform,
-} from '@expo/eas-build-job';
+import { ArchiveSource, ArchiveSourceType, Job, Metadata, Platform } from '@expo/eas-build-job';
 import { CredentialsSource } from '@expo/eas-json';
 import assert from 'assert';
 import chalk from 'chalk';
@@ -32,12 +26,7 @@ import { transformMetadata } from './graphql';
 import { LocalBuildMode, runLocalBuildAsync } from './local';
 import { collectMetadataAsync } from './metadata';
 import { printDeprecationWarnings } from './utils/printBuildInfo';
-import {
-  LocalFile,
-  makeProjectMetadataFileAsync,
-  makeProjectTarballAsync,
-  reviewAndCommitChangesAsync,
-} from './utils/repository';
+import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository';
 import { BuildEvent } from '../analytics/AnalyticsManager';
 import { withAnalyticsAsync } from '../analytics/common';
 import { getExpoWebsiteBaseUrl } from '../api';
@@ -76,14 +65,14 @@ export interface JobData<Credentials> {
  projectArchive: ArchiveSource;
 }

-interface Builder<TPlatform extends Platform, Credentials, TJob extends BuildJob> {
+interface Builder<TPlatform extends Platform, Credentials, TJob extends Job> {
  ctx: BuildContext<TPlatform>;

  ensureCredentialsAsync(
    ctx: BuildContext<TPlatform>
  ): Promise<CredentialsResult<Credentials> | undefined>;
  syncProjectConfigurationAsync(ctx: BuildContext<TPlatform>): Promise<void>;
-  prepareJobAsync(ctx: BuildContext<TPlatform>, jobData: JobData<Credentials>): Promise<BuildJob>;
+  prepareJobAsync(ctx: BuildContext<TPlatform>, jobData: JobData<Credentials>): Promise<Job>;
  sendBuildRequestAsync(
    appId: string,
    job: TJob,
@@ -108,7 +97,7 @@ function resolveBuildParamsInput<T extends Platform>(
 export async function prepareBuildRequestForPlatformAsync<
  TPlatform extends Platform,
  Credentials,
-  TJob extends BuildJob,
+  TJob extends Job,
 >(builder: Builder<TPlatform, Credentials, TJob>): Promise<BuildRequestSender> {
  const { ctx } = builder;
  const credentialsResult = await withAnalyticsAsync(
@@ -144,10 +133,9 @@ export async function prepareBuildRequestForPlatformAsync<

  let projectArchive: ArchiveSource | undefined;
  if (ctx.localBuildOptions.localBuildMode === LocalBuildMode.LOCAL_BUILD_PLUGIN) {
-    const projectPath = (await makeProjectTarballAsync(ctx.vcsClient)).path;
    projectArchive = {
      type: ArchiveSourceType.PATH,
-      path: projectPath,
+      path: (await makeProjectTarballAsync(ctx.vcsClient)).path,
    };
  } else if (ctx.localBuildOptions.localBuildMode === LocalBuildMode.INTERNAL) {
    projectArchive = {
@@ -157,7 +145,7 @@ export async function prepareBuildRequestForPlatformAsync<
  } else if (!ctx.localBuildOptions.localBuildMode) {
    projectArchive = {
      type: ArchiveSourceType.GCS,
-      ...(await uploadProjectAsync(ctx)),
+      bucketKey: await uploadProjectAsync(ctx),
    };
  }
  assert(projectArchive);
@@ -243,10 +231,7 @@ export function handleBuildRequestError(error: any, platform: Platform): never {

 async function uploadProjectAsync<TPlatform extends Platform>(
  ctx: BuildContext<TPlatform>
-): Promise<{
-  bucketKey: string;
-  metadataLocation?: string;
-}> {
+): Promise<string> {
  let projectTarballPath;
  try {
    return await withAnalyticsAsync(
@@ -275,6 +260,7 @@ async function uploadProjectAsync<TPlatform extends Platform>(
        }

        projectTarballPath = projectTarball.path;
+
        const bucketKey = await uploadFileAtPathToGCSAsync(
          ctx.graphqlClient,
          UploadSessionType.EasBuildGcsProjectSources,
@@ -288,11 +274,7 @@ async function uploadProjectAsync<TPlatform extends Platform>(
            completedMessage: (duration: string) => `Uploaded to EAS ${chalk.dim(duration)}`,
          })
        );
-        const { metadataLocation } = await uploadMetadataFileAsync<TPlatform>(projectTarball, ctx);
-        if (metadataLocation) {
-          return { bucketKey, metadataLocation };
-        }
-        return { bucketKey };
+        return bucketKey;
      },
      {
        attemptEvent: BuildEvent.PROJECT_UPLOAD_ATTEMPT,
@@ -303,11 +285,9 @@ async function uploadProjectAsync<TPlatform extends Platform>(
    );
  } catch (err: any) {
    let errMessage = 'Failed to upload the project tarball to EAS Build';
-
    if (err.message) {
      errMessage += `\n\nReason: ${err.message}`;
    }
-
    throw new EasBuildProjectArchiveUploadError(errMessage);
  } finally {
    if (projectTarballPath) {
@@ -316,49 +296,7 @@ async function uploadProjectAsync<TPlatform extends Platform>(
  }
 }

-async function uploadMetadataFileAsync<TPlatform extends Platform>(
-  projectTarball: LocalFile,
-  ctx: BuildContext<TPlatform>
-): Promise<{ metadataLocation: string | null }> {
-  let projectMetadataFile: LocalFile | null = null;
-  try {
-    projectMetadataFile = await makeProjectMetadataFileAsync(projectTarball.path);
-
-    const metadataLocation = await uploadFileAtPathToGCSAsync(
-      ctx.graphqlClient,
-      UploadSessionType.EasBuildGcsProjectMetadata,
-      projectMetadataFile.path,
-      createProgressTracker({
-        total: projectMetadataFile.size,
-        message: ratio =>
-          `Uploading metadata to EAS Build (${formatBytes(
-            projectMetadataFile!.size * ratio
-          )} / ${formatBytes(projectMetadataFile!.size)})`,
-        completedMessage: (duration: string) => `Uploaded to EAS ${chalk.dim(duration)}`,
-      })
-    );
-    return { metadataLocation };
-  } catch (err: any) {
-    let errMessage = 'Failed to upload metadata to EAS Build';
-
-    if (err.message) {
-      errMessage += `\n\nReason: ${err.message}`;
-    }
-
-    Log.warn(errMessage);
-    return { metadataLocation: null };
-  } finally {
-    if (projectMetadataFile) {
-      await fs.remove(projectMetadataFile.path);
-    }
-  }
-}
-
-async function sendBuildRequestAsync<
-  TPlatform extends Platform,
-  Credentials,
-  TJob extends BuildJob,
->(
+async function sendBuildRequestAsync<TPlatform extends Platform, Credentials, TJob extends Job>(
  builder: Builder<TPlatform, Credentials, TJob>,
  job: TJob,
  metadata: Metadata,
@@ -40,7 +40,7 @@ async function configureAsync({
  nonInteractive,
  vcsClient,
 }: ConfigureParams): Promise<void> {
-  await maybeBailOnRepoStatusAsync(vcsClient, nonInteractive);
+  await maybeBailOnRepoStatusAsync(vcsClient);

  await createEasJsonAsync(projectDir, vcsClient);

@@ -1,7 +1,6 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile, EasJson } from '@expo/eas-json';
-import { LoggerLevel } from '@expo/logger';
 import { NodePackageManager } from '@expo/package-manager';

 import { LocalBuildOptions } from './local';
@@ -61,6 +60,4 @@ export interface BuildContext<T extends Platform> {
  developmentClient: boolean;
  requiredPackageManager: NodePackageManager['name'] | null;
  vcsClient: Client;
-  loggerLevel?: LoggerLevel;
-  repack: boolean;
 }
@@ -1,7 +1,6 @@
 import { Platform } from '@expo/eas-build-job';
 import { BuildProfile, EasJson, ResourceClass } from '@expo/eas-json';
 import JsonFile from '@expo/json-file';
-import { LoggerLevel } from '@expo/logger';
 import { resolvePackageManager } from '@expo/package-manager';
 import getenv from 'getenv';
 import resolveFrom from 'resolve-from';
@@ -16,8 +15,6 @@ import { Analytics, AnalyticsEventProperties, BuildEvent } from '../analytics/An
 import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectConfigContextField';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { CredentialsContext } from '../credentials/context';
-import { getAppFromContextAsync } from '../credentials/ios/actions/BuildCredentialsUtils';
-import { GetAscApiKey } from '../credentials/ios/actions/GetAscApiKey';
 import { CustomBuildConfigMetadata } from '../project/customBuildConfig';
 import { getOwnerAccountForProjectIdAsync } from '../project/projectUtils';
 import { resolveWorkflowAsync } from '../project/workflow';
@@ -42,9 +39,6 @@ export async function createBuildContextAsync<T extends Platform>({
  vcsClient,
  getDynamicPrivateProjectConfigAsync,
  customBuildConfigMetadata,
-  buildLoggerLevel,
-  freezeCredentials,
-  repack,
 }: {
  buildProfileName: string;
  buildProfile: BuildProfile<T>;
@@ -63,14 +57,13 @@ export async function createBuildContextAsync<T extends Platform>({
  vcsClient: Client;
  getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn;
  customBuildConfigMetadata?: CustomBuildConfigMetadata;
-  buildLoggerLevel?: LoggerLevel;
-  freezeCredentials: boolean;
-  repack: boolean;
 }): Promise<BuildContext<T>> {
  const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({ env: buildProfile.env });
  const projectName = exp.slug;
  const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
-  const workflow = await resolveWorkflowAsync(projectDir, platform, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, platform, vcsClient, {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+  });
  const accountId = account.id;
  const runFromCI = getenv.boolish('CI', false);
  const developmentClient =
@@ -92,7 +85,6 @@ export async function createBuildContextAsync<T extends Platform>({
    env: buildProfile.env,
    easJsonCliConfig,
    vcsClient,
-    freezeCredentials,
  });

  const devClientProperties = getDevClientEventProperties({
@@ -146,8 +138,6 @@ export async function createBuildContextAsync<T extends Platform>({
    customBuildConfigMetadata,
    developmentClient,
    requiredPackageManager,
-    loggerLevel: buildLoggerLevel,
-    repack,
  };
  if (platform === Platform.ANDROID) {
    const common = commonContext as CommonContext<Platform.ANDROID>;
@@ -157,23 +147,10 @@ export async function createBuildContextAsync<T extends Platform>({
    } as BuildContext<T>;
  } else {
    const common = commonContext as CommonContext<Platform.IOS>;
-    const iosBuildCtx = {
+    return {
      ...common,
      ios: await createIosContextAsync(common),
    } as BuildContext<T>;
-    const appLookupParams = {
-      ...(await getAppFromContextAsync(credentialsCtx)),
-      bundleIdentifier: (iosBuildCtx as BuildContext<Platform.IOS>).ios.bundleIdentifier,
-    };
-    const ascForBuilds = await GetAscApiKey.getForBuildServiceAsync(
-      appLookupParams,
-      credentialsCtx
-    );
-    if (ascForBuilds) {
-      credentialsCtx.configureAppStoreAuth(ascForBuilds);
-    }
-
-    return iosBuildCtx;
  }
 }

@@ -6,7 +6,6 @@ import {
  Metadata,
  Workflow,
 } from '@expo/eas-build-job';
-import { LoggerLevel } from '@expo/logger';
 import assert from 'assert';

 import {
@@ -19,7 +18,6 @@ import {
  BuildTrigger as GraphQLBuildTrigger,
  ProjectArchiveSourceInput,
  ProjectArchiveSourceType,
-  WorkerLoggerLevel,
 } from '../graphql/generated';

 export function transformProjectArchive(archiveSource: ArchiveSource): ProjectArchiveSourceInput {
@@ -27,7 +25,6 @@ export function transformProjectArchive(archiveSource: ArchiveSource): ProjectAr
    return {
      type: ProjectArchiveSourceType.Gcs,
      bucketKey: archiveSource.bucketKey,
-      metadataLocation: archiveSource.metadataLocation,
    };
  } else if (archiveSource.type === ArchiveSourceType.URL) {
    return {
@@ -110,12 +107,3 @@ export function transformBuildTrigger(buildTrigger: BuildTrigger): GraphQLBuildT
  }
  throw new Error('Unknown build trigger');
 }
-
-export const loggerLevelToGraphQLWorkerLoggerLevel: Record<LoggerLevel, WorkerLoggerLevel> = {
-  [LoggerLevel.TRACE]: WorkerLoggerLevel.Trace,
-  [LoggerLevel.DEBUG]: WorkerLoggerLevel.Debug,
-  [LoggerLevel.INFO]: WorkerLoggerLevel.Info,
-  [LoggerLevel.WARN]: WorkerLoggerLevel.Warn,
-  [LoggerLevel.ERROR]: WorkerLoggerLevel.Error,
-  [LoggerLevel.FATAL]: WorkerLoggerLevel.Fatal,
-};
@@ -6,7 +6,7 @@ import os from 'os';
 import type { XCBuildConfiguration } from 'xcode';

 import { readPlistAsync } from '../../../utils/plist';
-import { resolveVcsClient } from '../../../vcs';
+import { getVcsClient } from '../../../vcs';
 import {
  BumpStrategy,
  bumpVersionAsync,
@@ -19,7 +19,7 @@ import {

 jest.mock('fs');

-const vcsClient = resolveVcsClient();
+const vcsClient = getVcsClient();

 const getXCBuildConfigurationFromPbxproj = jest.spyOn(
  IOSConfig.Target,
@@ -1,4 +1,4 @@
-import { Ios, Metadata, Platform, Workflow } from '@expo/eas-build-job';
+import { Ios, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
 import { AppVersionSource } from '@expo/eas-json';

 import { ensureIosCredentialsAsync } from './credentials';
@@ -89,13 +89,12 @@ export async function prepareIosBuildAsync(
            ? false
            : ctx.buildProfile.autoIncrement,
        vcsClient: ctx.vcsClient,
-        env: ctx.buildProfile.env,
      });
    },
    prepareJobAsync: async (
      ctx: BuildContext<Platform.IOS>,
      jobData: JobData<IosCredentials>
-    ): Promise<Ios.Job> => {
+    ): Promise<Job> => {
      return await prepareJobAsync(ctx, {
        ...jobData,
        buildScheme: ctx.ios.xcodeBuildContext.buildScheme,
@@ -3,7 +3,6 @@ import nullthrows from 'nullthrows';

 import { IosJobInput, IosJobSecretsInput } from '../../graphql/generated';
 import {
-  loggerLevelToGraphQLWorkerLoggerLevel,
  transformBuildMode,
  transformBuildTrigger,
  transformProjectArchive,
@@ -16,6 +15,7 @@ export function transformJob(job: Ios.Job): IosJobInput {
    triggeredBy: transformBuildTrigger(job.triggeredBy),
    projectArchive: transformProjectArchive(job.projectArchive),
    projectRootDirectory: nullthrows(job.projectRootDirectory),
+    releaseChannel: job.releaseChannel,
    updates: job.updates,
    secrets: job.secrets ? transformIosSecrets(job.secrets) : undefined,
    builderEnvironment: job.builderEnvironment,
@@ -31,9 +31,6 @@ export function transformJob(job: Ios.Job): IosJobInput {
    experimental: job.experimental,
    mode: transformBuildMode(job.mode),
    customBuildConfig: job.customBuildConfig,
-    loggerLevel: job.loggerLevel
-      ? loggerLevelToGraphQLWorkerLoggerLevel[job.loggerLevel]
-      : undefined,
  };
 }

@@ -3,8 +3,9 @@ import {
  BuildMode,
  BuildTrigger,
  Ios,
+  Job,
  Platform,
-  sanitizeBuildJob,
+  sanitizeJob,
 } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
 import nullthrows from 'nullthrows';
@@ -13,7 +14,7 @@ import slash from 'slash';

 import { IosCredentials, TargetCredentials } from '../../credentials/ios/types';
 import { IosJobSecretsInput } from '../../graphql/generated';
-import { getCustomBuildConfigPathForJob } from '../../project/customBuildConfig';
+import { getCustomBuildConfigPath } from '../../project/customBuildConfig';
 import { getUsername } from '../../project/projectUtils';
 import { BuildContext } from '../context';

@@ -31,7 +32,7 @@ const cacheDefaults = {
 export async function prepareJobAsync(
  ctx: BuildContext<Platform.IOS>,
  jobData: JobData
-): Promise<Ios.Job> {
+): Promise<Job> {
  const username = getUsername(ctx.exp, ctx.user);
  const buildProfile: BuildProfile<Platform.IOS> = ctx.buildProfile;
  const projectRootDirectory =
@@ -45,7 +46,7 @@ export async function prepareJobAsync(
  }

  const maybeCustomBuildConfigPath = buildProfile.config
-    ? getCustomBuildConfigPathForJob(buildProfile.config)
+    ? getCustomBuildConfigPath(buildProfile.config)
    : undefined;

  const job: Ios.Job = {
@@ -62,6 +63,7 @@ export async function prepareJobAsync(
      bundler: buildProfile.bundler,
      cocoapods: buildProfile.cocoapods,
      fastlane: buildProfile.fastlane,
+      expoCli: buildProfile.expoCli,
      env: buildProfile.env,
    },
    cache: {
@@ -72,6 +74,7 @@ export async function prepareJobAsync(
    secrets: {
      buildCredentials,
    },
+    releaseChannel: buildProfile.releaseChannel,
    updates: { channel: buildProfile.channel },
    developmentClient: buildProfile.developmentClient,
    simulator: buildProfile.simulator,
@@ -88,21 +91,15 @@ export async function prepareJobAsync(
    experimental: {
      prebuildCommand: buildProfile.prebuildCommand,
    },
-    mode: buildProfile.config || ctx.repack ? BuildMode.CUSTOM : BuildMode.BUILD,
+    mode: buildProfile.config ? BuildMode.CUSTOM : BuildMode.BUILD,
    triggeredBy: BuildTrigger.EAS_CLI,
    ...(maybeCustomBuildConfigPath && {
      customBuildConfig: {
        path: maybeCustomBuildConfigPath,
      },
    }),
-    ...(ctx.repack && {
-      customBuildConfig: {
-        path: '__eas/repack.yml',
-      },
-    }),
-    loggerLevel: ctx.loggerLevel,
  };
-  return sanitizeBuildJob(job) as Ios.Job;
+  return sanitizeJob(job);
 }

 export function prepareCredentialsToResign(credentials: IosCredentials): IosJobSecretsInput {
@@ -1,5 +1,5 @@
 import { ExpoConfig } from '@expo/config';
-import { Env, Platform, Workflow } from '@expo/eas-build-job';
+import { Platform, Workflow } from '@expo/eas-build-job';
 import { IosVersionAutoIncrement } from '@expo/eas-json';

 import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
@@ -15,21 +15,21 @@ export async function syncProjectConfigurationAsync({
  targets,
  localAutoIncrement,
  vcsClient,
-  env,
 }: {
  projectDir: string;
  exp: ExpoConfig;
  targets: Target[];
  localAutoIncrement?: IosVersionAutoIncrement;
  vcsClient: Client;
-  env: Env | undefined;
 }): Promise<void> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient, {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+  });
  const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement ?? false);

  if (workflow === Workflow.GENERIC) {
    if (isExpoUpdatesInstalled(projectDir)) {
-      await syncUpdatesConfigurationAsync({ vcsClient, projectDir, exp, workflow, env });
+      await syncUpdatesConfigurationAsync(vcsClient, projectDir, exp);
    }
    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, targets });
  } else {
@@ -114,7 +114,9 @@ export async function readShortVersionAsync(
  buildSettings: XCBuildConfiguration['buildSettings'],
  vcsClient: Client
 ): Promise<string | undefined> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient, {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+  });
  if (workflow === Workflow.GENERIC) {
    const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);

@@ -136,7 +138,9 @@ export async function readBuildNumberAsync(
  buildSettings: XCBuildConfiguration['buildSettings'],
  vcsClient: Client
 ): Promise<string | undefined> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient, {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+  });
  if (workflow === Workflow.GENERIC) {
    const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
    return (
@@ -6,7 +6,7 @@ import semver from 'semver';
 import { ora } from '../ora';

 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
-const PLUGIN_PACKAGE_VERSION = '1.0.112';
+const PLUGIN_PACKAGE_VERSION = '1.0.60';

 export enum LocalBuildMode {
  /**
@@ -1,3 +1,4 @@
+import { Updates } from '@expo/config-plugins';
 import { Metadata, Platform, sanitizeMetadata } from '@expo/eas-build-job';
 import { IosEnterpriseProvisioning } from '@expo/eas-json';
 import fs from 'fs-extra';
@@ -9,16 +10,25 @@ import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios
 import { LocalBuildMode } from './local';
 import { BuildDistributionType } from './types';
 import Log from '../log';
-import { getUsername, isExpoUpdatesInstalled } from '../project/projectUtils';
-import { resolveRuntimeVersionAsync } from '../project/resolveRuntimeVersionAsync';
-import { readChannelSafelyAsync as readAndroidChannelSafelyAsync } from '../update/android/UpdatesModule';
-import { readChannelSafelyAsync as readIosChannelSafelyAsync } from '../update/ios/UpdatesModule';
+import {
+  getUsername,
+  isClassicUpdatesSupportedAsync,
+  isExpoUpdatesInstalled,
+} from '../project/projectUtils';
+import {
+  readChannelSafelyAsync as readAndroidChannelSafelyAsync,
+  readReleaseChannelSafelyAsync as readAndroidReleaseChannelSafelyAsync,
+} from '../update/android/UpdatesModule';
+import {
+  readChannelSafelyAsync as readIosChannelSafelyAsync,
+  readReleaseChannelSafelyAsync as readIosReleaseChannelSafelyAsync,
+} from '../update/ios/UpdatesModule';
 import { easCliVersion } from '../utils/easCli';

 export async function collectMetadataAsync<T extends Platform>(
  ctx: BuildContext<T>
 ): Promise<Metadata> {
-  const channelObject = await resolveChannelAsync(ctx);
+  const channelOrReleaseChannel = await resolveChannelOrReleaseChannelAsync(ctx);
  const distribution = ctx.buildProfile.distribution ?? BuildDistributionType.STORE;
  const metadata: Metadata = {
    trackingContext: ctx.analyticsEventProperties,
@@ -28,16 +38,10 @@ export async function collectMetadataAsync<T extends Platform>(
    credentialsSource: ctx.buildProfile.credentialsSource,
    sdkVersion: ctx.exp.sdkVersion,
    runtimeVersion:
-      (await resolveRuntimeVersionAsync({
-        exp: ctx.exp,
-        platform: ctx.platform,
-        workflow: ctx.workflow,
-        projectDir: ctx.projectDir,
-        env: ctx.buildProfile.env,
-        cwd: ctx.projectDir,
-      })) ?? undefined,
+      (await Updates.getRuntimeVersionNullableAsync(ctx.projectDir, ctx.exp, ctx.platform)) ??
+      undefined,
    reactNativeVersion: await getReactNativeVersionAsync(ctx.projectDir),
-    ...channelObject,
+    ...channelOrReleaseChannel,
    distribution,
    appName: ctx.exp.name,
    appIdentifier: resolveAppIdentifier(ctx),
@@ -115,9 +119,9 @@ function resolveAppIdentifier<T extends Platform>(ctx: BuildContext<T>): string
  }
 }

-async function resolveChannelAsync<T extends Platform>(
+async function resolveChannelOrReleaseChannelAsync<T extends Platform>(
  ctx: BuildContext<T>
-): Promise<{ channel: string } | null> {
+): Promise<{ channel: string } | { releaseChannel: string } | null> {
  if (!isExpoUpdatesInstalled(ctx.projectDir)) {
    return null;
  }
@@ -129,7 +133,31 @@ async function resolveChannelAsync<T extends Platform>(
    return { channel };
  }

-  return null;
+  if (!(await isClassicUpdatesSupportedAsync(ctx.projectDir))) {
+    return null;
+  }
+
+  if (ctx.buildProfile.releaseChannel) {
+    return { releaseChannel: ctx.buildProfile.releaseChannel };
+  }
+
+  const releaseChannel = await getNativeReleaseChannelAsync(ctx);
+  return { releaseChannel };
+}
+
+async function getNativeReleaseChannelAsync<T extends Platform>(
+  ctx: BuildContext<T>
+): Promise<string> {
+  switch (ctx.platform) {
+    case Platform.ANDROID: {
+      return (await readAndroidReleaseChannelSafelyAsync(ctx.projectDir)) ?? 'default';
+    }
+    case Platform.IOS: {
+      return (await readIosReleaseChannelSafelyAsync(ctx.projectDir)) ?? 'default';
+    }
+    default:
+      return 'default';
+  }
 }

 async function getNativeChannelAsync<T extends Platform>(
@@ -1,5 +1,5 @@
 import { ExpoConfig } from '@expo/config-types';
-import { Env, Platform, Workflow } from '@expo/eas-build-job';
+import { Platform, Workflow } from '@expo/eas-build-job';
 import {
  AppVersionSource,
  BuildProfile,
@@ -9,7 +9,6 @@ import {
  ResourceClass,
  SubmitProfile,
 } from '@expo/eas-json';
-import { LoggerLevel } from '@expo/logger';
 import assert from 'assert';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
@@ -20,7 +19,7 @@ import { ensureProjectConfiguredAsync } from './configure';
 import { BuildContext } from './context';
 import { createBuildContextAsync } from './createContext';
 import { prepareIosBuildAsync } from './ios/build';
-import { LocalBuildMode, LocalBuildOptions } from './local';
+import { LocalBuildOptions } from './local';
 import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient';
 import { printBuildResults, printLogsUrls } from './utils/printBuildInfo';
 import { ensureRepoIsCleanAsync } from './utils/repository';
@@ -71,6 +70,7 @@ import {
 } from '../submit/submit';
 import { printSubmissionDetailsUrls } from '../submit/utils/urls';
 import { ensureEASUpdateIsConfiguredAsync } from '../update/configure';
+import { validateBuildProfileConfigMatchesProjectConfigAsync } from '../update/utils';
 import { Actor } from '../user/User';
 import { downloadAndMaybeExtractAppAsync } from '../utils/download';
 import { truthy } from '../utils/expodash/filter';
@@ -93,9 +93,6 @@ export interface BuildFlags {
  localBuildOptions: LocalBuildOptions;
  resourceClass?: ResourceClass;
  message?: string;
-  buildLoggerLevel?: LoggerLevel;
-  freezeCredentials: boolean;
-  repack: boolean;
 }

 export async function runBuildAndSubmitAsync(
@@ -106,9 +103,7 @@ export async function runBuildAndSubmitAsync(
  flags: BuildFlags,
  actor: Actor,
  getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn
-): Promise<{
-  buildIds: string[];
-}> {
+): Promise<void> {
  await vcsClient.ensureRepoExistsAsync();
  await ensureRepoIsCleanAsync(vcsClient, flags.nonInteractive);

@@ -137,36 +132,6 @@ export async function runBuildAndSubmitAsync(
    }. ${learnMore('https://docs.expo.dev/build-reference/variables/')}`
  );

-  for (const buildProfile of buildProfiles) {
-    if (buildProfile.profile.image && ['default', 'stable'].includes(buildProfile.profile.image)) {
-      Log.warn(
-        `The "image" field in the build profile "${buildProfile.profileName}" is set to "${buildProfile.profile.image}". This tag is deprecated and will be removed in the future. Use other images or tags listed here: https://docs.expo.dev/build-reference/infrastructure/`
-      );
-    }
-
-    if (
-      buildProfile.profile.image &&
-      [
-        'macos-monterey-12.4-xcode-13.4',
-        'macos-monterey-12.3-xcode-13.3',
-        'macos-monterey-12.1-xcode-13.2',
-        'macos-ventura-13.4-xcode-14.3.1',
-        'macos-ventura-13.3-xcode-14.3',
-        'macos-monterey-12.6-xcode-14.2',
-        'macos-monterey-12.6-xcode-14.1',
-        'macos-monterey-12.6-xcode-14.0',
-      ].includes(buildProfile.profile.image)
-    ) {
-      Log.warn(
-        `The "image" field in the build profile "${buildProfile.profileName}" is set to "${
-          buildProfile.profile.image
-        }". This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting "macos-sonoma-14.4-xcode-15.3" or "latest" as your image value. This image will be removed from EAS Build on May 29th, 2024. ${learnMore(
-          'https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates'
-        )}`
-      );
-    }
-  }
-
  await ensureExpoDevClientInstalledForDevClientBuildsAsync({
    projectDir,
    nonInteractive: flags.nonInteractive,
@@ -215,25 +180,13 @@ export async function runBuildAndSubmitAsync(
    buildCtxByPlatform[platform] = buildCtx;
  }

-  if (flags.localBuildOptions.localBuildMode === LocalBuildMode.LOCAL_BUILD_PLUGIN) {
-    return {
-      buildIds: startedBuilds.map(({ build }) => build.id),
-    };
+  if (flags.localBuildOptions.localBuildMode) {
+    return;
  }

-  if (flags.localBuildOptions.localBuildMode === LocalBuildMode.INTERNAL) {
-    const startedBuild = await BuildQuery.byIdAsync(
-      graphqlClient,
-      nullthrows(process.env.EAS_BUILD_ID, 'EAS_BUILD_ID is not defined')
-    );
-    startedBuilds.push({ build: startedBuild, buildProfile: buildProfiles[0] });
-  }
-
-  if (!flags.localBuildOptions.localBuildMode) {
-    Log.newLine();
-    printLogsUrls(startedBuilds.map(startedBuild => startedBuild.build));
-    Log.newLine();
-  }
+  Log.newLine();
+  printLogsUrls(startedBuilds.map(startedBuild => startedBuild.build));
+  Log.newLine();

  const submissions: SubmissionFragment[] = [];
  if (flags.autoSubmit) {
@@ -266,26 +219,16 @@ export async function runBuildAndSubmitAsync(
      submissions.push(submission);
    }

-    if (!flags.localBuildOptions.localBuildMode) {
-      Log.newLine();
-      printSubmissionDetailsUrls(submissions);
-      Log.newLine();
-    }
-  }
-
-  if (flags.localBuildOptions.localBuildMode) {
-    return {
-      buildIds: startedBuilds.map(({ build }) => build.id),
-    };
+    Log.newLine();
+    printSubmissionDetailsUrls(submissions);
+    Log.newLine();
  }

  if (!flags.wait) {
    if (flags.json) {
      printJsonOnlyOutput(startedBuilds.map(buildInfo => buildInfo.build));
    }
-    return {
-      buildIds: startedBuilds.map(({ build }) => build.id),
-    };
+    return;
  }

  const { accountName } = Object.values(buildCtxByPlatform)[0];
@@ -326,9 +269,6 @@ export async function runBuildAndSubmitAsync(
    }
    exitWithNonZeroCodeIfSomeSubmissionsDidntFinish(completedSubmissions);
  }
-  return {
-    buildIds: startedBuilds.map(({ build }) => build.id),
-  };
 }

 async function prepareAndStartBuildAsync({
@@ -374,9 +314,6 @@ async function prepareAndStartBuildAsync({
    vcsClient,
    getDynamicPrivateProjectConfigAsync,
    customBuildConfigMetadata,
-    buildLoggerLevel: flags.buildLoggerLevel,
-    freezeCredentials: flags.freezeCredentials,
-    repack: flags.repack,
  });

  if (moreBuilds) {
@@ -389,6 +326,12 @@ async function prepareAndStartBuildAsync({
    );
  }

+  await validateBuildProfileConfigMatchesProjectConfigAsync(
+    buildCtx.exp,
+    buildProfile,
+    buildCtx.projectId,
+    flags.nonInteractive
+  );
  if (buildProfile.profile.channel) {
    await validateExpoUpdatesInstalledAsProjectDependencyAsync({
      exp: buildCtx.exp,
@@ -398,7 +341,6 @@ async function prepareAndStartBuildAsync({
      sdkVersion: buildCtx.exp.sdkVersion,
      nonInteractive: flags.nonInteractive,
      buildProfile,
-      env: buildProfile.profile.env,
    });
    if (isUsingEASUpdate(buildCtx.exp, buildCtx.projectId)) {
      const doesChannelExist = await doesChannelExistAsync(graphqlClient, {
@@ -479,7 +421,6 @@ async function prepareAndStartSubmissionAsync({
    projectId: buildCtx.projectId,
    exp: buildCtx.exp,
    vcsClient: buildCtx.vcsClient,
-    isVerboseFastlaneEnabled: false,
  });

  if (moreBuilds) {
@@ -543,7 +484,6 @@ async function validateExpoUpdatesInstalledAsProjectDependencyAsync({
  buildProfile,
  nonInteractive,
  sdkVersion,
-  env,
 }: {
  exp: ExpoConfig;
  projectId: string;
@@ -552,7 +492,6 @@ async function validateExpoUpdatesInstalledAsProjectDependencyAsync({
  buildProfile: ProfileData<'build'>;
  nonInteractive: boolean;
  sdkVersion?: string;
-  env: Env | undefined;
 }): Promise<void> {
  if (isExpoUpdatesInstalledOrAvailable(projectDir, sdkVersion)) {
    return;
@@ -580,7 +519,6 @@ async function validateExpoUpdatesInstalledAsProjectDependencyAsync({
        projectDir,
        platform: RequestedPlatform.All,
        vcsClient,
-        env,
      });
      Log.withTick('Installed expo-updates and configured EAS Update.');
      throw new Error('Command must be re-run to pick up new updates configuration.');
@@ -43,7 +43,11 @@ export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
  );

  const workflowPerPlatformList = await Promise.all(
-    platformsToCheck.map(platform => resolveWorkflowAsync(projectDir, platform, vcsClient))
+    platformsToCheck.map(platform =>
+      resolveWorkflowAsync(projectDir, platform, vcsClient, {
+        useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+      })
+    )
  );

  Log.newLine();
@@ -51,6 +51,10 @@ export function formatGraphQLBuild(build: BuildFragment): string {
      label: 'Enterprise Provisioning',
      value: build.iosEnterpriseProvisioning?.toLowerCase(),
    },
+    {
+      label: 'Release Channel',
+      value: build.releaseChannel,
+    },
    {
      label: 'Channel',
      value: build.channel,
@@ -12,10 +12,7 @@ import { getTmpDirectory } from '../../utils/paths';
 import { endTimer, formatMilliseconds, startTimer } from '../../utils/timer';
 import { Client } from '../../vcs/vcs';

-export async function maybeBailOnRepoStatusAsync(
-  vcsClient: Client,
-  nonInteractive: boolean
-): Promise<void> {
+export async function maybeBailOnRepoStatusAsync(vcsClient: Client): Promise<void> {
  if (!(await vcsClient.isCommitRequiredAsync())) {
    return;
  }
@@ -31,11 +28,6 @@ export async function maybeBailOnRepoStatusAsync(
  });

  if (!answer) {
-    if (nonInteractive) {
-      Log.log('The following files need to be committed:');
-      await vcsClient.showChangedFilesAsync();
-    }
-
    throw new Error('Commit all changes. Aborting...');
  }
 }
@@ -55,9 +47,6 @@ export async function ensureRepoIsCleanAsync(
    )}.`
  );
  if (nonInteractive) {
-    Log.log('The following files need to be committed:');
-    await vcsClient.showChangedFilesAsync();
-
    throw new Error('Commit all changes. Aborting...');
  }
  const answer = await confirmAsync({
@@ -94,55 +83,9 @@ export async function commitPromptAsync(
  });
 }

-export type LocalFile = {
-  path: string;
-  size: number;
-};
-
-export async function makeProjectMetadataFileAsync(archivePath: string): Promise<LocalFile> {
-  const spinner = ora('Creating project metadata file');
-  const timerLabel = 'makeProjectMetadataFileAsync';
-  const timer = setTimeout(
-    () => {
-      spinner.start();
-    },
-    Log.isDebug ? 1 : 1000
-  );
-  startTimer(timerLabel);
-
-  const metadataLocation = path.join(getTmpDirectory(), `${uuidv4()}-eas-build-metadata.json`);
-  const archiveContent: string[] = [];
-
-  try {
-    await tar.list({
-      file: archivePath,
-      onentry: (entry: tar.ReadEntry) => {
-        if (entry.type === 'File' && !entry.path.includes('.git/')) {
-          archiveContent.push(entry.path);
-        }
-      },
-    });
-
-    await fs.writeJSON(metadataLocation, {
-      archiveContent,
-    });
-  } catch (e) {
-    clearTimeout(timer);
-    if (spinner.isSpinning) {
-      spinner.fail();
-    }
-    throw e;
-  }
-  clearTimeout(timer);
-
-  const duration = endTimer(timerLabel);
-  const prettyTime = formatMilliseconds(duration);
-  spinner.succeed(`Created project metadata file ${chalk.dim(prettyTime)}`);
-
-  return { path: metadataLocation, size: await fs.stat(metadataLocation).then(stat => stat.size) };
-}
-
-export async function makeProjectTarballAsync(vcsClient: Client): Promise<LocalFile> {
+export async function makeProjectTarballAsync(
+  vcsClient: Client
+): Promise<{ path: string; size: number }> {
  const spinner = ora('Compressing project files');

  await fs.mkdirp(getTmpDirectory());
@@ -164,7 +107,9 @@ export async function makeProjectTarballAsync(vcsClient: Client): Promise<LocalF
  startTimer(compressTimerLabel);

  try {
-    await vcsClient.makeShallowCopyAsync(shallowClonePath);
+    await vcsClient.makeShallowCopyAsync(shallowClonePath, {
+      useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+    });
    await tar.create({ cwd: shallowClonePath, file: tarPath, prefix: 'project', gzip: true }, [
      '.',
    ]);
@@ -32,7 +32,9 @@ export async function checkGoogleServicesFileAsync<T extends Platform>(
  if (
    (await fs.pathExists(absGoogleServicesFilePath)) &&
    (!isInsideDirectory(absGoogleServicesFilePath, rootDir) ||
-      (await ctx.vcsClient.isFileIgnoredAsync(path.relative(rootDir, absGoogleServicesFilePath))))
+      (await ctx.vcsClient.isFileIgnoredAsync(path.relative(rootDir, absGoogleServicesFilePath), {
+        useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+      })))
  ) {
    Log.warn(
      `File specified via "${ctx.platform}.googleServicesFile" field in your app.json is not checked in to your repository and won't be uploaded to the builder.`
@@ -1,6 +1,5 @@
 import { Command } from '@oclif/core';
 import { CombinedError } from '@urql/core';
-import chalk from 'chalk';
 import { GraphQLError } from 'graphql/error';
 import nullthrows from 'nullthrows';

@@ -25,7 +24,6 @@ import {
 } from '../analytics/AnalyticsManager';
 import Log from '../log';
 import SessionManager from '../user/SessionManager';
-import { Client } from '../vcs/vcs';

 export type ContextInput<
  T extends {
@@ -141,7 +139,7 @@ export default abstract class EasCommand extends Command {
    } = object,
  >(
    commandClass: { contextDefinition: ContextInput<C> },
-    { nonInteractive, vcsClientOverride }: { nonInteractive: boolean; vcsClientOverride?: Client }
+    { nonInteractive }: { nonInteractive: boolean }
  ): Promise<ContextOutput<C>> {
    const contextDefinition = commandClass.contextDefinition;

@@ -154,7 +152,6 @@ export default abstract class EasCommand extends Command {
          nonInteractive,
          sessionManager: this.sessionManager,
          analytics: this.analytics,
-          vcsClientOverride,
        }),
      ]);
    }
@@ -211,13 +208,7 @@ export default abstract class EasCommand extends Command {
          const defaultMsg = `${messageLine}${requestIdLine}`;

          if (graphQLError.extensions?.errorCode === 'UNAUTHORIZED_ERROR') {
-            return `${chalk.bold(
-              `You don't have the required permissions to perform this operation.`
-            )}\n\nThis can sometimes happen if you are logged in as incorrect user.\nRun ${chalk.bold(
-              'eas whoami'
-            )} to check the username you are logged in as.\nRun ${chalk.bold(
-              'eas login'
-            )} to change the account.\n\nOriginal error message: ${defaultMsg}`;
+            return `You don't have the required permissions to perform this operation.\n\n${defaultMsg}`;
          }

          return defaultMsg;
@@ -1,12 +1,10 @@
 import { Analytics } from '../../analytics/AnalyticsManager';
 import SessionManager from '../../user/SessionManager';
-import { Client } from '../../vcs/vcs';

 export interface ContextOptions {
  sessionManager: SessionManager;
  analytics: Analytics;
  nonInteractive: boolean;
-  vcsClientOverride?: Client;
 }

 export default abstract class ContextField<T> {
@@ -1,18 +1,9 @@
-import { EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
-
 import ContextField from './ContextField';
-import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
-import { resolveVcsClient } from '../../vcs';
+import { getVcsClient } from '../../vcs';
 import { Client } from '../../vcs/vcs';

 export default class VcsClientContextField extends ContextField<Client> {
-  async getValueAsync({ vcsClientOverride }: { vcsClientOverride?: Client }): Promise<Client> {
-    if (vcsClientOverride) {
-      return vcsClientOverride;
-    }
-    const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
-    const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
-    const config = await EasJsonUtils.getCliConfigAsync(easJsonAccessor);
-    return resolveVcsClient(config?.requireCommit);
+  async getValueAsync(): Promise<Client> {
+    return getVcsClient();
  }
 }
@@ -55,7 +55,6 @@ describe(getProjectIdAsync, () => {
        ],
        isExpoAdmin: false,
        featureGates: {},
-        preferences: {},
      },
      authenticationInfo: { accessToken: 'fake', sessionSecret: null },
    });
@@ -80,7 +79,6 @@ describe(getProjectIdAsync, () => {
    jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
      id: '1234',
      fullName: '@notnotbrent/test',
-      name: 'test',
      slug: 'test',
      ownerAccount: { name: 'notnotbrent' } as any,
    });
@@ -101,7 +99,6 @@ describe(getProjectIdAsync, () => {
    jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
      id: '1234',
      fullName: '@notnotbrent/test',
-      name: 'test',
      slug: 'test',
      ownerAccount: { name: 'notnotbrent' } as any,
    });
@@ -126,7 +123,6 @@ describe(getProjectIdAsync, () => {
    jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
      id: '1234',
      fullName: '@totallybrent/test',
-      name: 'test',
      slug: 'test',
      ownerAccount: { name: 'totallybrent' } as any,
    });
@@ -175,7 +171,6 @@ describe(getProjectIdAsync, () => {
    jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
      id: '1234',
      fullName: '@totallybrent/test',
-      name: 'test',
      slug: 'test',
      ownerAccount: { name: 'totallybrent' } as any,
    });
@@ -200,7 +195,6 @@ describe(getProjectIdAsync, () => {
    jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
      id: '1234',
      fullName: '@notnotbrent/test',
-      name: 'test',
      slug: 'test',
      ownerAccount: { name: 'notnotbrent' } as any,
    });
@@ -270,7 +264,6 @@ describe(getProjectIdAsync, () => {
    jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
      id: '1234',
      fullName: '@notnotbrent/test',
-      name: 'test',
      slug: 'test',
      ownerAccount: { name: 'notnotbrent' } as any,
    });
@@ -8,20 +8,20 @@ import semver from 'semver';

 import { learnMore } from '../../../log';
 import { easCliVersion } from '../../../utils/easCli';
-import { resolveVcsClient } from '../../../vcs';
+import { getVcsClient, setVcsClient } from '../../../vcs';
+import GitClient from '../../../vcs/clients/git';

 async function applyCliConfigAsync(projectDir: string): Promise<void> {
  const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
  const config = await EasJsonUtils.getCliConfigAsync(easJsonAccessor);
  if (config?.version && !semver.satisfies(easCliVersion, config.version)) {
    throw new Error(
-      `You are on eas-cli@${easCliVersion} which does not satisfy the CLI version constraint defined in eas.json (${
-        config.version
-      }).\n\nThis error probably means that you need update your eas-cli to a newer version.\nRun ${chalk.bold(
-        'npm install -g eas-cli'
-      )} to update the eas-cli to the latest version.`
+      `You are on eas-cli@${easCliVersion} which does not satisfy the CLI version constraint in eas.json (${config.version})`
    );
  }
+  if (config?.requireCommit) {
+    setVcsClient(new GitClient());
+  }
 }

 async function ensureEasCliIsNotInDependenciesAsync(projectDir: string): Promise<void> {
@@ -92,7 +92,7 @@ export async function findProjectRootAsync({
  } else {
    let vcsRoot;
    try {
-      vcsRoot = path.normalize(await resolveVcsClient().getRootPathAsync());
+      vcsRoot = path.normalize(await getVcsClient().getRootPathAsync());
    } catch {}
    if (vcsRoot && vcsRoot.startsWith(projectRootDir) && vcsRoot !== projectRootDir) {
      throw new Error(
@@ -3,7 +3,7 @@ import { ExpoConfig } from '@expo/config-types';
 import { Env } from '@expo/eas-build-job';
 import chalk from 'chalk';

-import { ExpoGraphqlClient, createGraphqlClient } from './createGraphqlClient';
+import { createGraphqlClient } from './createGraphqlClient';
 import { findProjectRootAsync } from './findProjectDirAndVerifyProjectSetupAsync';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import Log, { learnMore } from '../../../log';
@@ -87,21 +87,6 @@ export async function getProjectIdAsync(
  });
  const graphqlClient = createGraphqlClient(authenticationInfo);

-  const projectId = await validateOrSetProjectIdAsync({ exp, graphqlClient, actor, options });
-  return projectId;
-}
-
-export async function validateOrSetProjectIdAsync({
-  exp,
-  graphqlClient,
-  actor,
-  options,
-}: {
-  exp: ExpoConfig;
-  graphqlClient: ExpoGraphqlClient;
-  actor: Actor;
-  options: { env?: Env; nonInteractive: boolean };
-}): Promise<string> {
  const localProjectId = exp.extra?.eas?.projectId;
  if (localProjectId) {
    if (typeof localProjectId !== 'string') {
@@ -13,6 +13,7 @@ export default class AccountLogin extends EasCommand {
      description: 'Login with SSO',
      char: 's',
      default: false,
+      hidden: true,
    }),
  };

@@ -72,22 +72,20 @@ export default class BuildConfigure extends EasCommand {
    // configure expo-updates
    if (expoUpdatesIsInstalled) {
      if ([RequestedPlatform.Android, RequestedPlatform.All].includes(platform)) {
-        const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+        const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient, {
+          useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+        });
        if (workflow === Workflow.GENERIC) {
-          await syncAndroidUpdatesConfigurationAsync({ projectDir, exp, workflow, env: undefined });
+          await syncAndroidUpdatesConfigurationAsync(projectDir, exp);
        }
      }

      if ([RequestedPlatform.Ios, RequestedPlatform.All].includes(platform)) {
-        const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+        const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient, {
+          useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+        });
        if (workflow === Workflow.GENERIC) {
-          await syncIosUpdatesConfigurationAsync({
-            vcsClient,
-            projectDir,
-            exp,
-            workflow,
-            env: undefined,
-          });
+          await syncIosUpdatesConfigurationAsync(vcsClient, projectDir, exp);
        }
      }
    }
@@ -1,6 +1,5 @@
 import { Platform } from '@expo/eas-build-job';
 import { EasJsonAccessor, EasJsonUtils, ResourceClass } from '@expo/eas-json';
-import { LoggerLevel } from '@expo/logger';
 import { Errors, Flags } from '@oclif/core';
 import chalk from 'chalk';
 import figures from 'figures';
@@ -34,9 +33,6 @@ interface RawBuildFlags {
  'auto-submit-with-profile'?: string;
  'resource-class'?: ResourceClass;
  message?: string;
-  'build-logger-level'?: LoggerLevel;
-  'freeze-credentials': boolean;
-  repack: boolean;
 }

 export default class Build extends EasCommand {
@@ -102,19 +98,6 @@ export default class Build extends EasCommand {
      char: 'm',
      description: 'A short message describing the build',
    }),
-    'build-logger-level': Flags.enum({
-      description: 'The level of logs to output during the build process. Defaults to "info".',
-      options: Object.values(LoggerLevel),
-    }),
-    'freeze-credentials': Flags.boolean({
-      default: false,
-      description: 'Prevent the build from updating credentials in non-interactive mode',
-    }),
-    repack: Flags.boolean({
-      default: false,
-      hidden: true,
-      description: 'Use the golden dev client build repack flow as it works for onboarding',
-    }),
    ...EasNonInteractiveAndJsonFlags,
  };

@@ -227,9 +210,6 @@ export default class Build extends EasCommand {
      submitProfile: flags['auto-submit-with-profile'] ?? profile,
      resourceClass: flags['resource-class'],
      message,
-      buildLoggerLevel: flags['build-logger-level'],
-      freezeCredentials: flags['freeze-credentials'],
-      repack: flags.repack,
    };
  }

@@ -94,7 +94,9 @@ export default class BuildInspect extends EasCommand {

    if (flags.stage === InspectStage.ARCHIVE) {
      await vcsClient.ensureRepoExistsAsync();
-      await vcsClient.makeShallowCopyAsync(tmpWorkingdir);
+      await vcsClient.makeShallowCopyAsync(tmpWorkingdir, {
+        useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+      });
      await this.copyToOutputDirAsync(tmpWorkingdir, outputDirectory);
    } else {
      try {
@@ -105,7 +107,6 @@ export default class BuildInspect extends EasCommand {
          projectDir,
          {
            nonInteractive: false,
-            freezeCredentials: false,
            wait: true,
            clearCache: false,
            json: false,
@@ -120,7 +121,6 @@ export default class BuildInspect extends EasCommand {
              workingdir: tmpWorkingdir,
              artifactsDir: path.join(tmpWorkingdir, 'artifacts'),
            },
-            repack: false,
          },
          actor,
          getDynamicPrivateProjectConfigAsync
@@ -6,6 +6,7 @@ import { runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
 import EasCommand from '../../commandUtils/EasCommand';
 import { RequestedPlatform } from '../../platform';
 import { enableJsonOutput } from '../../utils/json';
+import { setVcsClient } from '../../vcs';
 import GitNoCommitClient from '../../vcs/clients/gitNoCommit';

 /**
@@ -29,17 +30,6 @@ export default class BuildInternal extends EasCommand {
        'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
      helpValue: 'PROFILE_NAME',
    }),
-    'auto-submit': Flags.boolean({
-      default: false,
-      description:
-        'Submit on build complete using the submit profile with the same name as the build profile',
-      exclusive: ['auto-submit-with-profile'],
-    }),
-    'auto-submit-with-profile': Flags.string({
-      description: 'Submit on build complete using the submit profile with provided name',
-      helpValue: 'PROFILE_NAME',
-      exclusive: ['auto-submit'],
-    }),
  };

  static override contextDefinition = {
@@ -63,9 +53,10 @@ export default class BuildInternal extends EasCommand {
      vcsClient,
    } = await this.getContextAsync(BuildInternal, {
      nonInteractive: true,
-      vcsClientOverride: new GitNoCommitClient(),
    });

+    setVcsClient(new GitNoCommitClient());
+
    await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);

    await runBuildAndSubmitAsync(
@@ -77,16 +68,13 @@ export default class BuildInternal extends EasCommand {
        requestedPlatform: flags.platform as RequestedPlatform,
        profile: flags.profile,
        nonInteractive: true,
-        freezeCredentials: false,
        wait: false,
        clearCache: false,
        json: true,
-        autoSubmit: flags['auto-submit'] || flags['auto-submit-with-profile'] !== undefined,
+        autoSubmit: false,
        localBuildOptions: {
          localBuildMode: LocalBuildMode.INTERNAL,
        },
-        submitProfile: flags['auto-submit-with-profile'] ?? flags.profile,
-        repack: false,
      },
      actor,
      getDynamicPrivateProjectConfigAsync
@@ -88,7 +88,6 @@ export default class BuildVersionGetView extends EasCommand {
        buildProfile: profile,
        platform,
        vcsClient,
-        nonInteractive: flags['non-interactive'],
      });
      const remoteVersions = await AppVersionQuery.latestVersionAsync(
        graphqlClient,
@@ -77,7 +77,6 @@ export default class BuildVersionSetView extends EasCommand {
      buildProfile: profile,
      platform,
      vcsClient,
-      nonInteractive: false,
    });
    const remoteVersions = await AppVersionQuery.latestVersionAsync(
      graphqlClient,
@@ -102,7 +102,6 @@ export default class BuildVersionSyncView extends EasCommand {
        buildProfile: profileInfo.profile,
        platform: profileInfo.platform,
        vcsClient,
-        nonInteractive: false,
      });
      const remoteVersions = await AppVersionQuery.latestVersionAsync(
        graphqlClient,
@@ -110,7 +109,9 @@ export default class BuildVersionSyncView extends EasCommand {
        toAppPlatform(profileInfo.platform),
        applicationIdentifier
      );
-      const workflow = await resolveWorkflowAsync(projectDir, profileInfo.platform, vcsClient);
+      const workflow = await resolveWorkflowAsync(projectDir, profileInfo.platform, vcsClient, {
+        useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+      });
      if (!remoteVersions?.buildVersion) {
        Log.warn(
          `Skipping versions sync for ${platformDisplayName}. There are no versions configured on Expo servers, use "eas build:version:set" or run a build to initialize it.`
@@ -125,7 +125,6 @@ export default class ChannelRollout extends EasCommand {

  static override contextDefinition = {
    ...this.ContextOptions.ProjectConfig,
-    ...this.ContextOptions.Vcs,
    ...this.ContextOptions.LoggedIn,
  };

@@ -134,7 +133,6 @@ export default class ChannelRollout extends EasCommand {
    const argsAndFlags = this.sanitizeArgsAndFlags({ ...flags, ...args });
    const {
      privateProjectConfig: { exp, projectId, projectDir },
-      vcsClient,
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelRollout, {
      nonInteractive: argsAndFlags.nonInteractive,
@@ -148,7 +146,6 @@ export default class ChannelRollout extends EasCommand {
      nonInteractive: argsAndFlags.nonInteractive,
      graphqlClient,
      app,
-      vcsClient,
    };
    if (argsAndFlags.nonInteractive) {
      await new NonInteractiveRollout(argsAndFlags).runAsync(ctx);
@@ -1,7 +1,7 @@
 import { Flags } from '@oclif/core';

-import EasCommand from '../../commandUtils/EasCommand';
-import { SelectPlatform } from '../../credentials/manager/SelectPlatform';
+import EasCommand from '../commandUtils/EasCommand';
+import { SelectPlatform } from '../credentials/manager/SelectPlatform';

 export default class Credentials extends EasCommand {
  static override description = 'manage credentials';
@@ -1,65 +0,0 @@
-import { Platform } from '@expo/eas-build-job';
-import { Flags } from '@oclif/core';
-
-import EasCommand from '../../commandUtils/EasCommand';
-import { SelectBuildProfileFromEasJson } from '../../credentials/manager/SelectBuildProfileFromEasJson';
-import { SetUpBuildCredentialsCommandAction } from '../../credentials/manager/SetUpBuildCredentialsCommandAction';
-import { selectPlatformAsync } from '../../platform';
-
-export default class InitializeBuildCredentials extends EasCommand {
-  static override description = 'Set up credentials for building your project.';
-
-  static override flags = {
-    platform: Flags.enum({
-      char: 'p',
-      options: [Platform.ANDROID, Platform.IOS],
-    }),
-    profile: Flags.string({
-      char: 'e',
-      description: 'The name of the build profile in eas.json.',
-      helpValue: 'PROFILE_NAME',
-    }),
-  };
-
-  static override contextDefinition = {
-    ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.ProjectConfig,
-    ...this.ContextOptions.DynamicProjectConfig,
-    ...this.ContextOptions.Analytics,
-    ...this.ContextOptions.Vcs,
-  };
-
-  async runAsync(): Promise<void> {
-    const { flags } = await this.parse(InitializeBuildCredentials);
-    const {
-      loggedIn: { actor, graphqlClient },
-      privateProjectConfig,
-      getDynamicPrivateProjectConfigAsync,
-      analytics,
-      vcsClient,
-    } = await this.getContextAsync(InitializeBuildCredentials, {
-      nonInteractive: false,
-    });
-
-    const platform = await selectPlatformAsync(flags.platform);
-
-    const buildProfile =
-      flags.profile ??
-      (await new SelectBuildProfileFromEasJson(
-        privateProjectConfig.projectDir,
-        Platform.IOS
-      ).getProfileNameFromEasConfigAsync());
-
-    await new SetUpBuildCredentialsCommandAction(
-      actor,
-      graphqlClient,
-      vcsClient,
-      analytics,
-      privateProjectConfig ?? null,
-      getDynamicPrivateProjectConfigAsync,
-      platform,
-      buildProfile,
-      process.cwd()
-    ).runAsync();
-  }
-}
@@ -1,10 +1,8 @@
 import { Platform } from '@expo/eas-build-job';
-import chalk from 'chalk';
 import envinfo from 'envinfo';

 import EasCommand from '../commandUtils/EasCommand';
 import Log from '../log';
-import { ora } from '../ora';
 import { resolveWorkflowAsync } from '../project/workflow';
 import { easCliVersion } from '../utils/easCli';
 import { Client } from '../vcs/vcs';
@@ -22,7 +20,6 @@ export default class Diagnostics extends EasCommand {
      nonInteractive: true,
    });

-    const spinner = ora().start(`Gathering diagnostic information...`);
    const info = await envinfo.run(
      {
        System: ['OS', 'Shell'],
@@ -43,10 +40,9 @@ export default class Diagnostics extends EasCommand {
        npmGlobalPackages: ['eas-cli', 'expo-cli'],
      },
      {
-        title: chalk.bold(`EAS CLI ${easCliVersion} environment info`),
+        title: `EAS CLI ${easCliVersion} environment info`,
      }
    );
-    spinner.succeed('All needed information gathered!');

    Log.log(info.trimEnd());
    await this.printWorkflowAsync(projectDir, vcsClient);
@@ -54,13 +50,17 @@ export default class Diagnostics extends EasCommand {
  }

  private async printWorkflowAsync(projectDir: string, vcsClient: Client): Promise<void> {
-    const androidWorkflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
-    const iosWorkflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+    const androidWorkflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient, {
+      useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+    });
+    const iosWorkflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient, {
+      useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+    });

    if (androidWorkflow === iosWorkflow) {
      Log.log(`    Project workflow: ${androidWorkflow}`);
    } else {
-      Log.log(`    Project workflow:`);
+      Log.log(`    Project Workflow:`);
      Log.log(`      Android: ${androidWorkflow}`);
      Log.log(`      iOS: ${iosWorkflow}`);
    }
@@ -110,7 +110,6 @@ describe(ProjectInit.name, () => {
        it('is no-op if already configured for id', async () => {
          jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
            id: '1234',
-            name: 'testing-123',
            slug: 'testing-123',
            fullName: '@jester/testing-123',
            ownerAccount: jester.accounts[0],
@@ -122,7 +121,6 @@ describe(ProjectInit.name, () => {
        it('prompts to overwrite when different', async () => {
          jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
            id: '1234',
-            name: 'testing-123',
            slug: 'testing-123',
            fullName: '@jester/testing-123',
            ownerAccount: jester.accounts[0],
@@ -137,7 +135,6 @@ describe(ProjectInit.name, () => {
          jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
            id: '1234',
            slug: 'testing-123',
-            name: 'testing-123',
            fullName: '@jester/testing-123',
            ownerAccount: jester.accounts[0],
          });
@@ -155,7 +152,6 @@ describe(ProjectInit.name, () => {
          jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
            id: '1234',
            slug: 'testing-123',
-            name: 'testing-123',
            fullName: '@jester/testing-123',
            ownerAccount: jester.accounts[0],
          });
@@ -190,7 +186,6 @@ describe(ProjectInit.name, () => {
          jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
            id: '1234',
            slug: 'testing-123',
-            name: 'testing-123',
            fullName: '@jester/testing-123',
            ownerAccount: jester.accounts[0],
          });
@@ -203,7 +198,6 @@ describe(ProjectInit.name, () => {
          jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
            id: '1234',
            slug: 'testing-124',
-            name: 'testing-123',
            fullName: '@jester2/testing-124',
            ownerAccount: jester2.accounts[0],
          });
@@ -229,7 +223,6 @@ describe(ProjectInit.name, () => {
          jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
            id: '1234',
            slug: 'testing-124',
-            name: 'testing-123',
            fullName: '@jester2/testing-124',
            ownerAccount: jester2.accounts[0],
          });
@@ -254,7 +247,6 @@ describe(ProjectInit.name, () => {
          jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
            id: '1234',
            slug: 'testing-124',
-            name: 'testing-123',
            fullName: '@jester2/testing-124',
            ownerAccount: jester2.accounts[0],
          });
@@ -281,7 +273,6 @@ describe(ProjectInit.name, () => {
        jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
          id: '1234',
          slug: 'testing-123',
-          name: 'testing-123',
          fullName: '@jester/testing-123',
          ownerAccount: jester.accounts[0],
        });
@@ -297,7 +288,6 @@ describe(ProjectInit.name, () => {
          jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
            id: '1234',
            slug: 'testing-123',
-            name: 'testing-123',
            fullName: '@jester/testing-123',
            ownerAccount: jester.accounts[0],
          });
@@ -312,7 +302,6 @@ describe(ProjectInit.name, () => {
          jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
            id: '1234',
            slug: 'testing-124',
-            name: 'testing-123',
            fullName: '@jester2/testing-124',
            ownerAccount: jester2.accounts[0],
          });
@@ -340,7 +329,6 @@ describe(ProjectInit.name, () => {
          jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
            id: '1234',
            slug: 'testing-124',
-            name: 'testing-123',
            fullName: '@jester2/testing-124',
            ownerAccount: jester2.accounts[0],
          });
@@ -367,7 +355,6 @@ describe(ProjectInit.name, () => {
          jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
            id: '1234',
            slug: 'testing-124',
-            name: 'testing-123',
            fullName: '@jester2/testing-124',
            ownerAccount: jester2.accounts[0],
          });
@@ -397,7 +384,6 @@ describe(ProjectInit.name, () => {
        jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
          id: '1234',
          slug: 'testing-123',
-          name: 'testing-123',
          fullName: '@jester/testing-123',
          ownerAccount: jester.accounts[0],
        });
@@ -412,7 +398,6 @@ describe(ProjectInit.name, () => {
        jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
          id: '1234',
          slug: 'testing-124',
-          name: 'testing-123',
          fullName: '@jester2/testing-124',
          ownerAccount: jester2.accounts[0],
        });
@@ -452,7 +437,6 @@ describe(ProjectInit.name, () => {
            jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
              id: '1234',
              slug: 'testing-123',
-              name: 'testing-123',
              fullName: '@jester/testing-123',
              ownerAccount: jester.accounts[0],
            });
@@ -480,7 +464,6 @@ describe(ProjectInit.name, () => {
            jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
              id: '0129',
              slug: 'testing-123',
-              name: 'testing-123',
              fullName: '@jester/testing-123',
              ownerAccount: jester.accounts[0],
            });
@@ -1,4 +1,4 @@
-import { ConfigError, getProjectConfigDescription } from '@expo/config';
+import { getProjectConfigDescription } from '@expo/config';
 import { ExpoConfig } from '@expo/config-types';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
@@ -60,19 +60,7 @@ export default class ProjectInit extends EasCommand {
    projectDir: string,
    modifications: Partial<ExpoConfig>
  ): Promise<void> {
-    let result;
-    try {
-      result = await createOrModifyExpoConfigAsync(projectDir, modifications);
-    } catch (error) {
-      if (error instanceof ConfigError && error.code === 'MODULE_NOT_FOUND') {
-        Log.warn(
-          'Cannot determine which native SDK version your project uses because the module `expo` is not installed.'
-        );
-        return;
-      } else {
-        throw error;
-      }
-    }
+    const result = await createOrModifyExpoConfigAsync(projectDir, modifications);
    switch (result.type) {
      case 'success':
        break;
@@ -1,475 +0,0 @@
-import { ExpoConfig } from '@expo/config-types';
-import { Platform } from '@expo/eas-build-job';
-import { EasJson } from '@expo/eas-json';
-import chalk from 'chalk';
-import fs from 'fs-extra';
-import path from 'path';
-
-import { getEASUpdateURL, getExpoWebsiteBaseUrl } from '../../api';
-import { runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
-import { reviewAndCommitChangesAsync } from '../../build/utils/repository';
-import EasCommand from '../../commandUtils/EasCommand';
-import { DynamicConfigContextFn } from '../../commandUtils/context/DynamicProjectConfigContextField';
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
-import { validateOrSetProjectIdAsync } from '../../commandUtils/context/contextUtils/getProjectIdAsync';
-import { CredentialsContextProjectInfo } from '../../credentials/context';
-import { SetUpBuildCredentialsCommandAction } from '../../credentials/manager/SetUpBuildCredentialsCommandAction';
-import {
-  AppFragment,
-  AppPlatform,
-  OnboardingDeviceType,
-  OnboardingEnvironment,
-} from '../../graphql/generated';
-import { UserPreferencesMutation } from '../../graphql/mutations/UserPreferencesMutation';
-import { AppQuery } from '../../graphql/queries/AppQuery';
-import Log, { learnMore, link } from '../../log';
-import { runGitCloneAsync, runGitPushAsync } from '../../onboarding/git';
-import { installDependenciesAsync } from '../../onboarding/installDependencies';
-import { runCommandAsync } from '../../onboarding/runCommand';
-import { RequestedPlatform } from '../../platform';
-import { ExpoConfigOptions, getPrivateExpoConfig } from '../../project/expoConfig';
-import { promptAsync } from '../../prompts';
-import { Actor } from '../../user/User';
-import { easCliVersion } from '../../utils/easCli';
-import GitClient from '../../vcs/clients/git';
-
-export default class Onboarding extends EasCommand {
-  static override hidden = true;
-
-  static override aliases = ['init:onboarding', 'onboarding'];
-
-  static override description = 'continue onboarding process started on the expo.dev website';
-
-  static override flags = {};
-
-  static override args = [{ name: 'TARGET_PROJECT_DIRECTORY' }];
-
-  static override contextDefinition = {
-    ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.Analytics,
-  };
-
-  async runAsync(): Promise<void> {
-    const {
-      args: { TARGET_PROJECT_DIRECTORY: targetProjectDirInput },
-    } = await this.parse(Onboarding);
-
-    const {
-      loggedIn: { actor, graphqlClient },
-      analytics,
-    } = await this.getContextAsync(Onboarding, {
-      nonInteractive: false,
-    });
-
-    if (actor.__typename === 'Robot') {
-      throw new Error(
-        'This command is not available for robot users. Make sure you are not using a robot token and try again.'
-      );
-    }
-
-    if (!actor.preferences.onboarding) {
-      throw new Error(
-        'This command can only be run as part of the onboarding process started on the Expo website. Visit https://expo.new to start a new project.'
-      );
-    }
-
-    if (!actor.preferences.onboarding.platform) {
-      throw new Error(
-        'This command can only be run as part of the onboarding process started on the Expo website. It seems like you started an onboarding process, but we are missing some information needed to be filled in before running the eas init:onboarding command (selected platform). Continue the onboarding process on the Expo website.'
-      );
-    }
-    if (!actor.preferences.onboarding.environment) {
-      throw new Error(
-        'This command can only be run as part of the onboarding process started on the Expo website. It seems like you started an onboarding process, but we are missing some information needed to be filled in before running the eas init:onboarding command (selected environment). Continue the onboarding process on the Expo website.'
-      );
-    }
-    if (!actor.preferences.onboarding.deviceType) {
-      throw new Error(
-        'This command can only be run as part of the onboarding process started on the Expo website. It seems like you started an onboarding process, but we are missing some information needed to be filled in before running the eas init:onboarding command (selected device type). Continue the onboarding process on the Expo website.'
-      );
-    }
-
-    if (
-      new Date(actor.preferences.onboarding.lastUsed) < new Date(Date.now() - 1000 * 60 * 60 * 24)
-    ) {
-      Log.warn(
-        'It seems like you started an onboarding process, but it has been a while since you last used it. If you want to start a new onboarding process, visit https://expo.new.'
-      );
-      Log.log();
-    }
-
-    const platform =
-      actor.preferences.onboarding.platform === AppPlatform.Android
-        ? Platform.ANDROID
-        : Platform.IOS;
-
-    const app = await AppQuery.byIdAsync(graphqlClient, actor.preferences.onboarding.appId);
-
-    const githubUsername = app.githubRepository
-      ? app.githubRepository.metadata.githubRepoOwnerName
-      : 'expo';
-    const githubRepositoryName = app.githubRepository
-      ? app.githubRepository.metadata.githubRepoName
-      : 'expo-template-default';
-
-    Log.log(`👋 Welcome to Expo, ${actor.username}!`);
-    Log.log();
-    Log.log('✨ We will continue your onboarding process in EAS CLI');
-    Log.log();
-    Log.log(
-      `🚚 Let's start by cloning ${
-        app.githubRepository
-          ? `your project (${githubUsername}/${githubRepositoryName})`
-          : `default Expo template project (${githubUsername}/${githubRepositoryName})`
-      } from GitHub and installing dependencies.`
-    );
-    Log.log();
-    let initialTargetProjectDirectory: string;
-    if (targetProjectDirInput) {
-      initialTargetProjectDirectory = targetProjectDirInput;
-      Log.log(`📂 Cloning the project to ${initialTargetProjectDirectory}`);
-    } else {
-      const { selectedTargetProjectDirectory } = await promptAsync({
-        type: 'text',
-        name: 'selectedTargetProjectDirectory',
-        message: app.githubRepository
-          ? '📂 Where would you like to clone the project to?'
-          : '📂 Where would you like to create your new project directory?',
-        initial: app.githubRepository
-          ? path.join(process.cwd(), githubRepositoryName)
-          : path.join(process.cwd(), `${actor.username}-first-project`),
-      });
-      initialTargetProjectDirectory = selectedTargetProjectDirectory;
-    }
-    Log.log();
-
-    const { targetProjectDir: finalTargetProjectDirectory } = await runGitCloneAsync({
-      githubUsername,
-      githubRepositoryName,
-      targetProjectDir: initialTargetProjectDirectory,
-    });
-
-    const vcsClient = new GitClient(finalTargetProjectDirectory);
-    if (!app.githubRepository) {
-      await fs.remove(path.join(finalTargetProjectDirectory, '.git'));
-      await runCommandAsync({
-        cwd: finalTargetProjectDirectory,
-        command: 'git',
-        args: ['init'],
-      });
-      Log.log();
-      await configureProjectFromBareDefaultExpoTemplateAsync({
-        app,
-        vcsClient,
-        targetDir: finalTargetProjectDirectory,
-      });
-    }
-
-    await installDependenciesAsync({
-      projectDir: finalTargetProjectDirectory,
-    });
-    const exp = await getPrivateExpoConfigWithProjectIdAsync({
-      projectDir: finalTargetProjectDirectory,
-      graphqlClient,
-      actor,
-    });
-    const getDynamicProjectConfigFn = getDynamicPrivateProjectConfigGetter({
-      projectDir: finalTargetProjectDirectory,
-      graphqlClient,
-      actor,
-    });
-
-    if (!app.githubRepository) {
-      await runCommandAsync({
-        cwd: finalTargetProjectDirectory,
-        command: 'npx',
-        args: ['expo', 'install', 'expo-updates'],
-      });
-      Log.log();
-      await runCommandAsync({
-        cwd: finalTargetProjectDirectory,
-        command: 'npx',
-        args: ['expo', 'install', 'expo-insights'],
-      });
-      Log.log();
-      await runCommandAsync({
-        cwd: finalTargetProjectDirectory,
-        command: 'npx',
-        args: ['expo', 'install', 'expo-dev-client'],
-      });
-      Log.log();
-    }
-    await vcsClient.trackFileAsync('package-lock.json');
-
-    const shouldSetupCredentials =
-      ((platform === Platform.IOS &&
-        actor.preferences.onboarding.deviceType === OnboardingDeviceType.Device) ||
-        platform === Platform.ANDROID) &&
-      actor.preferences.onboarding.environment === OnboardingEnvironment.DevBuild;
-    if (shouldSetupCredentials) {
-      Log.log('🔑 Now we need to set up build credentials for your project:');
-      await new SetUpBuildCredentialsCommandAction(
-        actor,
-        graphqlClient,
-        vcsClient,
-        analytics,
-        exp,
-        getDynamicProjectConfigFn,
-        platform,
-        actor.preferences.onboarding.deviceType === OnboardingDeviceType.Simulator
-          ? 'development-simulator'
-          : 'development',
-        finalTargetProjectDirectory
-      ).runAsync();
-    }
-
-    if (app.githubRepository && (await vcsClient.hasUncommittedChangesAsync())) {
-      Log.log(
-        '📦 We will now commit the changes made by the configuration process and push them to GitHub:'
-      );
-      Log.log();
-      Log.log('🔍 Checking for changes in the repository...');
-      await vcsClient.showChangedFilesAsync();
-      await reviewAndCommitChangesAsync(
-        vcsClient,
-        `[eas-onboarding] Install dependencies${
-          shouldSetupCredentials ? ' and set up build credentials' : ''
-        }`,
-        { nonInteractive: false }
-      );
-      Log.log('📤 Pushing changes to GitHub...');
-      await runGitPushAsync({
-        targetProjectDir: finalTargetProjectDirectory,
-      });
-    } else if (!app.githubRepository) {
-      await runCommandAsync({
-        cwd: finalTargetProjectDirectory,
-        command: 'git',
-        args: ['add', '.'],
-      });
-      Log.log();
-      await runCommandAsync({
-        cwd: finalTargetProjectDirectory,
-        command: 'git',
-        args: ['commit', '-m', 'Initial commit'],
-      });
-      Log.log();
-    }
-
-    Log.log();
-    Log.log('🎉 We finished configuring your project.');
-    Log.log();
-    if (
-      app.githubRepository ||
-      actor.preferences.onboarding.environment === OnboardingEnvironment.ExpoGo
-    ) {
-      Log.log('🚀 You can now go back to the website to continue:');
-      const url = new URL(
-        `/onboarding/develop/set-up-project-on-your-machine?project=${app.slug}&accountId=${app.ownerAccount.id}`,
-        getExpoWebsiteBaseUrl()
-      ).toString();
-      Log.log(`👉 ${link(url)}`);
-    } else {
-      Log.log('🚀 Now we are going to trigger your first build');
-      Log.log();
-      const { buildIds } = await runBuildAndSubmitAsync(
-        graphqlClient,
-        analytics,
-        vcsClient,
-        finalTargetProjectDirectory,
-        {
-          nonInteractive: true,
-          requestedPlatform:
-            platform === Platform.ANDROID ? RequestedPlatform.Android : RequestedPlatform.Ios,
-          profile:
-            actor.preferences.onboarding.deviceType === OnboardingDeviceType.Simulator
-              ? 'development-simulator'
-              : 'development',
-          wait: false,
-          clearCache: false,
-          json: false,
-          autoSubmit: false,
-          localBuildOptions: {},
-          freezeCredentials: false,
-          repack: true,
-        },
-        actor,
-        getDynamicProjectConfigFn
-      );
-      const buildId = buildIds[0];
-      Log.log();
-      Log.log('🚀 You can now go back to the website to continue:');
-      const url = new URL(
-        `/onboarding/develop/set-up-project-on-your-machine?project=${app.slug}&accountId=${app.ownerAccount.id}&buildId=${buildId}`,
-        getExpoWebsiteBaseUrl()
-      ).toString();
-      Log.log(`👉 ${link(url)}`);
-    }
-
-    const { __typename, ...previousPreferences } = actor.preferences.onboarding;
-    await UserPreferencesMutation.markCliDoneInOnboardingUserPreferencesAsync(graphqlClient, {
-      ...previousPreferences,
-      appId: app.id,
-    });
-  }
-}
-
-// we can't get this automated by using command context because when we run a command the project directory doesn't exist yet
-async function getPrivateExpoConfigWithProjectIdAsync({
-  projectDir,
-  graphqlClient,
-  actor,
-  options,
-}: {
-  projectDir: string;
-  graphqlClient: ExpoGraphqlClient;
-  actor: Actor;
-  options?: ExpoConfigOptions;
-}): Promise<CredentialsContextProjectInfo> {
-  const expBefore = getPrivateExpoConfig(projectDir, options);
-  const projectId = await validateOrSetProjectIdAsync({
-    exp: expBefore,
-    graphqlClient,
-    actor,
-    options: {
-      nonInteractive: false,
-    },
-  });
-  const exp = getPrivateExpoConfig(projectDir, options);
-  return {
-    exp,
-    projectId,
-  };
-}
-
-// we can't get this automated by using command context because when we run a command the project directory doesn't exist yet
-function getDynamicPrivateProjectConfigGetter({
-  projectDir,
-  graphqlClient,
-  actor,
-}: {
-  projectDir: string;
-  graphqlClient: ExpoGraphqlClient;
-  actor: Actor;
-}): DynamicConfigContextFn {
-  return async (options?: ExpoConfigOptions) => {
-    return {
-      ...(await getPrivateExpoConfigWithProjectIdAsync({
-        projectDir,
-        graphqlClient,
-        actor,
-        options,
-      })),
-      projectDir,
-    };
-  };
-}
-
-async function configureProjectFromBareDefaultExpoTemplateAsync({
-  app,
-  vcsClient,
-  targetDir,
-}: {
-  app: AppFragment;
-  vcsClient: GitClient;
-  targetDir: string;
-}): Promise<void> {
-  // Android package name requires each component to start with a lowercase letter.
-  const isUsernameValidSegment = /^[^a-z]/.test(app.ownerAccount.name);
-  const userPrefix = isUsernameValidSegment ? 'user' : '';
-  const isSlugValidSegment = /^[^a-z]/.test(app.slug);
-  const slugPrefix = isSlugValidSegment ? 'app' : '';
-
-  const bundleIdentifier = `com.${userPrefix}${stripInvalidCharactersForBundleIdentifier(
-    app.ownerAccount.name
-  )}.${slugPrefix}${stripInvalidCharactersForBundleIdentifier(app.slug)}`;
-  const updateUrl = getEASUpdateURL(app.id);
-
-  const easBuildGitHubConfig = {
-    android: {
-      image: 'latest',
-    },
-    ios: {
-      image: 'latest',
-    },
-  };
-
-  const easJson: EasJson = {
-    cli: {
-      version: `>= ${easCliVersion}`,
-    },
-    build: {
-      development: {
-        developmentClient: true,
-        distribution: 'internal',
-        channel: 'development',
-        ...easBuildGitHubConfig,
-      },
-      'development-simulator': {
-        extends: 'development',
-        ios: {
-          simulator: true,
-        },
-      },
-      preview: {
-        distribution: 'internal',
-        channel: 'preview',
-        ...easBuildGitHubConfig,
-      },
-      production: {
-        channel: 'production',
-        ...easBuildGitHubConfig,
-      },
-    },
-    submit: {
-      production: {},
-    },
-  };
-
-  const easJsonPath = path.join(targetDir, 'eas.json');
-  await fs.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
-  await vcsClient.trackFileAsync(easJsonPath);
-  Log.log(
-    `✅ Generated ${chalk.bold('eas.json')}. ${learnMore(
-      'https://docs.expo.dev/build-reference/eas-json/'
-    )}`
-  );
-  Log.log();
-
-  const expoConfig: ExpoConfig = {
-    name: app.name ?? app.slug,
-    slug: app.slug,
-    extra: {
-      eas: {
-        projectId: app.id,
-      },
-    },
-    owner: app.ownerAccount.name,
-    updates: {
-      url: updateUrl,
-    },
-    runtimeVersion: {
-      policy: 'appVersion',
-    },
-    ios: {
-      bundleIdentifier,
-    },
-    android: {
-      package: bundleIdentifier,
-    },
-  };
-
-  const appJsonPath = path.join(targetDir, 'app.json');
-  await fs.writeFile(appJsonPath, `${JSON.stringify({ expo: expoConfig }, null, 2)}\n`);
-  await vcsClient.trackFileAsync(appJsonPath);
-  Log.log(
-    `✅ Generated ${chalk.bold('app.json')}. ${learnMore(
-      'https://docs.expo.dev/versions/latest/config/app/'
-    )}`
-  );
-  Log.log();
-}
-
-function stripInvalidCharactersForBundleIdentifier(string: string): string {
-  return string.replaceAll(/[^A-Za-z0-9]/g, '');
-}
@@ -33,7 +33,6 @@ interface RawCommandFlags {
  verbose: boolean;
  wait: boolean;
  'non-interactive': boolean;
-  'verbose-fastlane': boolean;
 }

 interface CommandFlags {
@@ -43,7 +42,6 @@ interface CommandFlags {
  verbose: boolean;
  wait: boolean;
  nonInteractive: boolean;
-  isVerboseFastlaneEnabled: boolean;
 }

 export default class Submit extends EasCommand {
@@ -85,10 +83,6 @@ export default class Submit extends EasCommand {
      default: true,
      allowNo: true,
    }),
-    'verbose-fastlane': Flags.boolean({
-      default: false,
-      description: 'Enable verbose logging for the submission process',
-    }),
    'non-interactive': Flags.boolean({
      default: false,
      description: 'Run command in non-interactive mode',
@@ -138,7 +132,6 @@ export default class Submit extends EasCommand {
        profile: submissionProfile.profile,
        archiveFlags: flagsWithPlatform.archiveFlags,
        nonInteractive: flagsWithPlatform.nonInteractive,
-        isVerboseFastlaneEnabled: flagsWithPlatform.isVerboseFastlaneEnabled,
        actor,
        graphqlClient,
        analytics,
@@ -182,7 +175,6 @@ export default class Submit extends EasCommand {
      wait,
      profile,
      'non-interactive': nonInteractive,
-      'verbose-fastlane': isVerboseFastlaneEnabled,
      ...archiveFlags
    } = flags;

@@ -203,7 +195,6 @@ export default class Submit extends EasCommand {
      wait,
      profile,
      nonInteractive,
-      isVerboseFastlaneEnabled,
    };
  }

@@ -12,7 +12,6 @@ import {
  DynamicPublicProjectConfigContextField,
 } from '../../../commandUtils/context/DynamicProjectConfigContextField';
 import LoggedInContextField from '../../../commandUtils/context/LoggedInContextField';
-import VcsClientContextField from '../../../commandUtils/context/VcsClientContextField';
 import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
 import FeatureGateEnvOverrides from '../../../commandUtils/gating/FeatureGateEnvOverrides';
 import FeatureGating from '../../../commandUtils/gating/FeatureGating';
@@ -22,7 +21,6 @@ import { PublishMutation } from '../../../graphql/mutations/PublishMutation';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { collectAssetsAsync, uploadAssetsAsync } from '../../../project/publish';
 import { getBranchNameFromChannelNameAsync } from '../../../update/getBranchNameFromChannelNameAsync';
-import { resolveVcsClient } from '../../../vcs';

 const projectRoot = '/test-project';
 const commandOptions = { root: projectRoot } as any;
@@ -267,14 +265,10 @@ function mockTestProject({
    featureGating: new FeatureGating({}, new FeatureGateEnvOverrides()),
    graphqlClient,
  });
-  jest
-    .spyOn(VcsClientContextField.prototype, 'getValueAsync')
-    .mockResolvedValue(resolveVcsClient());

  jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
    id: '1234',
    slug: 'testing-123',
-    name: 'testing-123',
    fullName: '@jester/testing-123',
    ownerAccount: jester.accounts[0],
  });
@@ -367,7 +367,6 @@ function mockTestProject({
  jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
    id: '1234',
    slug: 'testing-123',
-    name: 'testing-123',
    fullName: '@jester/testing-123',
    ownerAccount: jester.accounts[0],
  });
@@ -11,7 +11,6 @@ import {
  DynamicPublicProjectConfigContextField,
 } from '../../../commandUtils/context/DynamicProjectConfigContextField';
 import LoggedInContextField from '../../../commandUtils/context/LoggedInContextField';
-import VcsClientContextField from '../../../commandUtils/context/VcsClientContextField';
 import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
 import FeatureGateEnvOverrides from '../../../commandUtils/gating/FeatureGateEnvOverrides';
 import FeatureGating from '../../../commandUtils/gating/FeatureGating';
@@ -20,7 +19,6 @@ import { UpdateFragment } from '../../../graphql/generated';
 import { PublishMutation } from '../../../graphql/mutations/PublishMutation';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { getBranchNameFromChannelNameAsync } from '../../../update/getBranchNameFromChannelNameAsync';
-import { resolveVcsClient } from '../../../vcs';
 import UpdateRollBackToEmbedded from '../roll-back-to-embedded';

 const projectRoot = '/test-project';
@@ -252,14 +250,10 @@ function mockTestProject({
    featureGating: new FeatureGating({}, new FeatureGateEnvOverrides()),
    graphqlClient,
  });
-  jest
-    .spyOn(VcsClientContextField.prototype, 'getValueAsync')
-    .mockResolvedValue(resolveVcsClient());

  jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
    id: '1234',
    slug: 'testing-123',
-    name: 'testing-123',
    fullName: '@jester/testing-123',
    ownerAccount: jester.accounts[0],
  });
@@ -52,7 +52,6 @@ export default class UpdateConfigure extends EasCommand {
      projectDir,
      platform,
      vcsClient,
-      env: undefined,
    });

    await ensureEASUpdateIsConfiguredInEasJsonAsync(projectDir);
@@ -1,5 +1,4 @@
 import { Platform as PublishPlatform } from '@expo/config';
-import { Workflow } from '@expo/eas-build-job';
 import { Errors, Flags } from '@oclif/core';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
@@ -7,6 +6,7 @@ import nullthrows from 'nullthrows';
 import { ensureBranchExistsAsync } from '../../branch/queries';
 import { ensureRepoIsCleanAsync } from '../../build/utils/repository';
 import { getUpdateGroupUrl } from '../../build/utils/url';
+import { ensureChannelExistsAsync } from '../../channel/queries';
 import EasCommand from '../../commandUtils/EasCommand';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import { getPaginatedQueryOptions } from '../../commandUtils/pagination';
@@ -40,7 +40,6 @@ import {
  resolveInputDirectoryAsync,
  uploadAssetsAsync,
 } from '../../project/publish';
-import { resolveWorkflowPerPlatformAsync } from '../../project/workflow';
 import { ensureEASUpdateIsConfiguredAsync } from '../../update/configure';
 import { getUpdateJsonInfosForUpdates } from '../../update/utils';
 import {
@@ -200,7 +199,6 @@ export default class UpdatePublish extends EasCommand {
      projectDir,
      projectId,
      vcsClient,
-      env: undefined,
    });

    const { exp } = await getDynamicPublicProjectConfigAsync();
@@ -353,7 +351,7 @@ export default class UpdatePublish extends EasCommand {
      Log.withInfo(
        `${platformString} (maximum: ${assetLimitPerUpdateGroup} total per update). ${learnMore(
          'https://expo.fyi/eas-update-asset-limits',
-          { learnMoreMessage: 'Learn more about asset limits' }
+          { learnMoreMessage: 'Learn more about asset limits.' }
        )}`
      );
    } catch (e) {
@@ -361,24 +359,30 @@ export default class UpdatePublish extends EasCommand {
      throw e;
    }

-    const workflows = await resolveWorkflowPerPlatformAsync(projectDir, vcsClient);
    const runtimeVersions = await getRuntimeVersionObjectAsync({
      exp,
      platforms: realizedPlatforms,
      projectDir,
-      workflows: {
-        ...workflows,
-        web: Workflow.UNKNOWN,
-      },
-      env: undefined,
+      vcsClient,
+      nonInteractive,
    });
    const runtimeToPlatformMapping =
      getRuntimeToPlatformMappingFromRuntimeVersions(runtimeVersions);

-    const { branchId } = await ensureBranchExistsAsync(graphqlClient, {
+    const { branchId, createdBranch } = await ensureBranchExistsAsync(graphqlClient, {
      appId: projectId,
      branchName,
    });
+    if (createdBranch) {
+      await ensureChannelExistsAsync(graphqlClient, {
+        appId: projectId,
+        branchId,
+        channelName: branchName,
+      });
+      Log.withTick(
+        `Channel: ${chalk.bold(branchName)} pointed at branch: ${chalk.bold(branchName)}`
+      );
+    }

    const gitCommitHash = await vcsClient.getCommitHashAsync();
    const isGitWorkingTreeDirty = await vcsClient.hasUncommittedChangesAsync();
@@ -514,7 +518,7 @@ export default class UpdatePublish extends EasCommand {
                  },
                ]
              : []),
-            { label: 'EAS Dashboard', value: updateGroupLink },
+            { label: 'Website link', value: updateGroupLink },
          ])
        );
        Log.addNewLineIfNone();
@@ -1,10 +1,11 @@
 import { Platform as PublishPlatform } from '@expo/config';
-import { Workflow } from '@expo/eas-build-job';
 import { Errors, Flags } from '@oclif/core';
+import chalk from 'chalk';
 import nullthrows from 'nullthrows';

 import { ensureBranchExistsAsync } from '../../branch/queries';
 import { getUpdateGroupUrl } from '../../build/utils/url';
+import { ensureChannelExistsAsync } from '../../channel/queries';
 import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
@@ -32,7 +33,6 @@ import {
  getRuntimeVersionObjectAsync,
  getUpdateMessageForCommandAsync,
 } from '../../project/publish';
-import { resolveWorkflowPerPlatformAsync } from '../../project/workflow';
 import { ensureEASUpdateIsConfiguredAsync } from '../../update/configure';
 import { getUpdateJsonInfosForUpdates } from '../../update/utils';
 import {
@@ -154,7 +154,6 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
      projectDir,
      projectId,
      vcsClient,
-      env: undefined,
    });

    // check that the expo-updates package version supports roll back to embedded
@@ -185,24 +184,29 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
    const realizedPlatforms: PublishPlatform[] =
      platformFlag === 'all' ? defaultPublishPlatforms : [platformFlag];

-    const { branchId } = await ensureBranchExistsAsync(graphqlClient, {
+    const { branchId, createdBranch } = await ensureBranchExistsAsync(graphqlClient, {
      appId: projectId,
      branchName,
    });
+    if (createdBranch) {
+      await ensureChannelExistsAsync(graphqlClient, {
+        appId: projectId,
+        branchId,
+        channelName: branchName,
+      });
+    }
+
+    Log.withTick(`Channel: ${chalk.bold(branchName)} pointed at branch: ${chalk.bold(branchName)}`);

    const gitCommitHash = await vcsClient.getCommitHashAsync();
    const isGitWorkingTreeDirty = await vcsClient.hasUncommittedChangesAsync();

-    const workflows = await resolveWorkflowPerPlatformAsync(projectDir, vcsClient);
    const runtimeVersions = await getRuntimeVersionObjectAsync({
      exp,
      platforms: realizedPlatforms,
      projectDir,
-      workflows: {
-        ...workflows,
-        web: Workflow.UNKNOWN,
-      },
-      env: undefined,
+      vcsClient,
+      nonInteractive,
    });

    let newUpdates: UpdatePublishMutation['updateBranch']['publishUpdateGroups'];
@@ -276,7 +280,7 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
                  },
                ]
              : []),
-            { label: 'EAS Dashboard', value: updateGroupLink },
+            { label: 'Website link', value: updateGroupLink },
          ])
        );
        Log.addNewLineIfNone();
@@ -55,7 +55,6 @@ export const testPKCS12EmptyPasswordKeystore: Keystore = {
 export const testAppFragment: AppFragment = {
  id: 'test-app-id',
  fullName: '@testuser/testapp',
-  name: 'testapp',
  slug: 'testapp',
  ownerAccount: {
    id: 'test-account-id',
@@ -1,5 +1,5 @@
 import AppStoreApi from '../ios/appstore/AppStoreApi';
-import { AuthCtx, AuthenticationMode } from '../ios/appstore/authenticateTypes';
+import { AuthCtx } from '../ios/appstore/authenticateTypes';

 export const testAuthCtx: AuthCtx = {
  appleId: 'test-apple-id',
@@ -9,7 +9,6 @@ export const testAuthCtx: AuthCtx = {

 export function getAppstoreMock(): AppStoreApi {
  return {
-    defaultAuthenticationMode: AuthenticationMode.USER,
    ensureAuthenticatedAsync: jest.fn(),
    ensureBundleIdExistsAsync: jest.fn(),
    listDistributionCertificatesAsync: jest.fn(),
@@ -1,5 +1,3 @@
-import assert from 'node:assert';
-
 import { AppFragment, Role } from '../../graphql/generated';
 import { Actor } from '../../user/User';

@@ -26,7 +24,6 @@ export const jester: Actor = {
  ],
  isExpoAdmin: false,
  featureGates: {},
-  preferences: {},
 };

 export const jester2 = {
@@ -44,7 +41,6 @@ export const jester2 = {
  featureGates: {},
 };

-assert(jester.__typename === 'User');
 export const testUsername = jester.username;
 export const testSlug = 'testApp';
 export const testProjectId = '7ef93448-3bc7-4b57-be32-99326dcf24f0';
@@ -80,7 +76,6 @@ export const testAppJsonWithDifferentOwner = {
 export const testAppQueryByIdResponse: AppFragment = {
  id: testProjectId,
  slug: testSlug,
-  name: 'testing 123',
  fullName: testExperienceName,
  ownerAccount: jester.accounts[0],
 };
@@ -55,7 +55,6 @@ export const testAppleAppIdentifierFragment: AppleAppIdentifierFragment = {
 export const testAppFragment: AppFragment = {
  id: 'test-app-id',
  fullName: '@testuser/testapp',
-  name: 'testapp',
  slug: 'testapp',
  ownerAccount: {
    id: 'test-account-id',
@@ -4,76 +4,27 @@ import gql from 'graphql-tag';
 import { ExpoGraphqlClient } from '../../../../../commandUtils/context/contextUtils/createGraphqlClient';
 import { withErrorHandlingAsync } from '../../../../../graphql/client';
 import {
+  GoogleServiceAccountKeyByAccountQuery,
  GoogleServiceAccountKeyFragment,
-  GoogleServiceAccountKeysPaginatedByAccountQuery,
 } from '../../../../../graphql/generated';
 import { GoogleServiceAccountKeyFragmentNode } from '../../../../../graphql/types/credentials/GoogleServiceAccountKey';
-import { Connection, QueryParams, fetchEntireDatasetAsync } from '../../../../../utils/relay';

 export const GoogleServiceAccountKeyQuery = {
  async getAllForAccountAsync(
    graphqlClient: ExpoGraphqlClient,
    accountName: string
  ): Promise<GoogleServiceAccountKeyFragment[]> {
-    const paginatedGetterAsync = async (
-      relayArgs: QueryParams
-    ): Promise<Connection<GoogleServiceAccountKeyFragment>> => {
-      return await GoogleServiceAccountKeyQuery.getAllForAccountPaginatedAsync(
-        graphqlClient,
-        accountName,
-        relayArgs
-      );
-    };
-    return await fetchEntireDatasetAsync({
-      paginatedGetterAsync,
-      progressBarLabel: 'fetching Google Service Account Keys...',
-    });
-  },
-  async getAllForAccountPaginatedAsync(
-    graphqlClient: ExpoGraphqlClient,
-    accountName: string,
-    {
-      after,
-      first,
-      before,
-      last,
-    }: { after?: string; first?: number; before?: string; last?: number }
-  ): Promise<
-    GoogleServiceAccountKeysPaginatedByAccountQuery['account']['byName']['googleServiceAccountKeysPaginated']
-  > {
    const data = await withErrorHandlingAsync(
      graphqlClient
-        .query<GoogleServiceAccountKeysPaginatedByAccountQuery>(
+        .query<GoogleServiceAccountKeyByAccountQuery>(
          gql`
-            query GoogleServiceAccountKeysPaginatedByAccountQuery(
-              $accountName: String!
-              $after: String
-              $first: Int
-              $before: String
-              $last: Int
-            ) {
+            query GoogleServiceAccountKeyByAccountQuery($accountName: String!) {
              account {
                byName(accountName: $accountName) {
                  id
-                  googleServiceAccountKeysPaginated(
-                    after: $after
-                    first: $first
-                    before: $before
-                    last: $last
-                  ) {
-                    edges {
-                      cursor
-                      node {
-                        id
-                        ...GoogleServiceAccountKeyFragment
-                      }
-                    }
-                    pageInfo {
-                      hasNextPage
-                      hasPreviousPage
-                      startCursor
-                      endCursor
-                    }
+                  googleServiceAccountKeys {
+                    id
+                    ...GoogleServiceAccountKeyFragment
                  }
                }
              }
@@ -82,10 +33,6 @@ export const GoogleServiceAccountKeyQuery = {
          `,
          {
            accountName,
-            after,
-            first,
-            before,
-            last,
          },
          {
            additionalTypenames: ['GoogleServiceAccountKey'],
@@ -93,6 +40,6 @@ export const GoogleServiceAccountKeyQuery = {
        )
        .toPromise()
    );
-    return data.account.byName.googleServiceAccountKeysPaginated;
+    return data.account.byName.googleServiceAccountKeys;
  },
 };
@@ -9,7 +9,6 @@ import AppStoreApi from './ios/appstore/AppStoreApi';
 import { AuthenticationMode } from './ios/appstore/authenticateTypes';
 import { Analytics } from '../analytics/AnalyticsManager';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
-import { AppStoreConnectApiKeyFragment, AppleTeamType } from '../graphql/generated';
 import Log from '../log';
 import { getPrivateExpoConfig } from '../project/expoConfig';
 import { confirmAsync } from '../prompts';
@@ -26,7 +25,6 @@ export class CredentialsContext {
  public readonly appStore = new AppStoreApi();
  public readonly ios = IosGraphqlClient;
  public readonly nonInteractive: boolean;
-  public readonly freezeCredentials: boolean = false;
  public readonly projectDir: string;
  public readonly user: Actor;
  public readonly graphqlClient: ExpoGraphqlClient;
@@ -49,7 +47,6 @@ export class CredentialsContext {
      graphqlClient: ExpoGraphqlClient;
      analytics: Analytics;
      vcsClient: Client;
-      freezeCredentials?: boolean;
      env?: Env;
    }
  ) {
@@ -61,7 +58,6 @@ export class CredentialsContext {
    this.vcsClient = options.vcsClient;
    this.nonInteractive = options.nonInteractive ?? false;
    this.projectInfo = options.projectInfo;
-    this.freezeCredentials = options.freezeCredentials ?? false;
  }

  get hasProjectContext(): boolean {
@@ -86,21 +82,6 @@ export class CredentialsContext {
    getPrivateExpoConfig(this.options.projectDir);
  }

-  public configureAppStoreAuth(ascApiKey: AppStoreConnectApiKeyFragment): void {
-    this.appStore.authCtx = {
-      ascApiKey: {
-        keyP8: ascApiKey.keyP8,
-        keyId: ascApiKey.keyIdentifier,
-        issuerId: ascApiKey.issuerIdentifier,
-      },
-      team: {
-        id: ascApiKey.appleTeam?.appleTeamIdentifier ?? '',
-        name: ascApiKey.appleTeam?.appleTeamName ?? undefined,
-        inHouse: ascApiKey.appleTeam?.appleTeamType === AppleTeamType.InHouse ?? false,
-      },
-    };
-  }
-
  async bestEffortAppStoreAuthenticateAsync(): Promise<void> {
    if (this.appStore.authCtx || !this.shouldAskAuthenticateAppStore) {
      // skip prompts if already have apple ctx or already asked about it
@@ -1,31 +1,9 @@
-import { learnMore } from '../log';
-
 export class MissingCredentialsNonInteractiveError extends Error {
  constructor(message?: string) {
    super(message ?? 'Credentials are not set up. Run this command again in interactive mode.');
  }
 }

-export class InsufficientAuthenticationNonInteractiveError extends Error {
-  constructor(message?: string) {
-    super(
-      message ??
-        `Authentication with an ASC API key is required in non-interactive mode. ${learnMore(
-          'https://docs.expo.dev/build/building-on-ci/#optional-provide-an-asc-api-token-for-your-apple-team'
-        )}`
-    );
-  }
-}
-
-export class ForbidCredentialModificationError extends Error {
-  constructor(message?: string) {
-    super(
-      message ??
-        'Credentials cannot be modified. Run this command again without the --freeze-credentials flag.'
-    );
-  }
-}
-
 export class MissingCredentialsError extends Error {
  constructor(message?: string) {
    super(message ?? 'Credentials are not set up.');
@@ -14,7 +14,6 @@ import { isAdHocProfile, isEnterpriseUniversalProfile } from './utils/provisioni
 import { CommonIosAppCredentialsFragment } from '../../graphql/generated';
 import Log from '../../log';
 import { findApplicationTarget } from '../../project/ios/target';
-import { isExpoNotificationsInstalled } from '../../project/projectUtils';
 import { selectAsync } from '../../prompts';
 import { CredentialsContext } from '../context';
 import * as credentialsJsonReader from '../credentialsJson/read';
@@ -106,11 +105,6 @@ export default class IosCredentialsProvider {

    if (ctx.easJsonCliConfig?.promptToConfigurePushNotifications === false) {
      return null;
-    } else if (
-      ctx.easJsonCliConfig?.promptToConfigurePushNotifications === undefined &&
-      !(await isExpoNotificationsInstalled(ctx.projectDir))
-    ) {
-      return null;
    }

    const setupOption = await selectAsync(
@@ -1,4 +1,3 @@
-import { UserRole } from '@expo/apple-utils';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 import { nanoid } from 'nanoid';
@@ -25,19 +24,10 @@ import { isAscApiKeyValidAndTrackedAsync } from '../validators/validateAscApiKey

 export enum AppStoreApiKeyPurpose {
  SUBMISSION_SERVICE = 'EAS Submit',
-  BUILD_SERVICE = 'EAS Build',
 }

-export const PURPOSE_TO_ROLES: Record<AppStoreApiKeyPurpose, UserRole[]> = {
-  [AppStoreApiKeyPurpose.SUBMISSION_SERVICE]: [UserRole.ADMIN],
-  [AppStoreApiKeyPurpose.BUILD_SERVICE]: [UserRole.ADMIN],
-};
-
-export async function promptForAscApiKeyPathAsync(
-  ctx: CredentialsContext,
-  roles: UserRole[]
-): Promise<AscApiKeyPath> {
-  const { keyId, keyP8Path } = await promptForKeyP8AndIdAsync(roles);
+export async function promptForAscApiKeyPathAsync(ctx: CredentialsContext): Promise<AscApiKeyPath> {
+  const { keyId, keyP8Path } = await promptForKeyP8AndIdAsync();

  const bestEffortIssuerId = await getBestEffortIssuerIdAsync(ctx, keyId);
  if (bestEffortIssuerId) {
@@ -70,15 +60,15 @@ export async function getMinimalAscApiKeyAsync(ascApiKey: AscApiKey): Promise<Mi

 export async function provideOrGenerateAscApiKeyAsync(
  ctx: CredentialsContext,
-  roles: UserRole[]
+  purpose: AppStoreApiKeyPurpose
 ): Promise<MinimalAscApiKey> {
  if (ctx.nonInteractive) {
    throw new Error(`A new App Store Connect API Key cannot be created in non-interactive mode.`);
  }

-  const userProvided = await promptForAscApiKeyAsync(ctx, roles);
+  const userProvided = await promptForAscApiKeyAsync(ctx);
  if (!userProvided) {
-    return await generateAscApiKeyAsync(ctx, roles);
+    return await generateAscApiKeyAsync(ctx, purpose);
  }

  if (!ctx.appStore.authCtx) {
@@ -96,49 +86,39 @@ export async function provideOrGenerateAscApiKeyAsync(
  if (useUserProvided) {
    return userProvided;
  }
-  return await provideOrGenerateAscApiKeyAsync(ctx, roles);
+  return await provideOrGenerateAscApiKeyAsync(ctx, purpose);
 }

 async function generateAscApiKeyAsync(
  ctx: CredentialsContext,
-  roles: UserRole[]
+  purpose: AppStoreApiKeyPurpose
 ): Promise<MinimalAscApiKey> {
  await ctx.appStore.ensureAuthenticatedAsync();
  const ascApiKey = await ctx.appStore.createAscApiKeyAsync(ctx.analytics, {
-    nickname: getAscApiKeyName(),
-    roles,
+    nickname: getAscApiKeyName(purpose),
  });
  return await getMinimalAscApiKeyAsync(ascApiKey);
 }

-export function getAscApiKeyName(): string {
-  const nameParts = ['[Expo]', nanoid(10)];
+export function getAscApiKeyName(purpose: AppStoreApiKeyPurpose): string {
+  const nameParts = ['[Expo]', purpose, nanoid(10)];
  return nameParts.join(' ');
 }

-async function promptForAscApiKeyAsync(
-  ctx: CredentialsContext,
-  roles: UserRole[]
-): Promise<MinimalAscApiKey | null> {
+async function promptForAscApiKeyAsync(ctx: CredentialsContext): Promise<MinimalAscApiKey | null> {
  const shouldAutoGenerateCredentials = await shouldAutoGenerateCredentialsAsync(ascApiKeyIdSchema);
  if (shouldAutoGenerateCredentials) {
    return null;
  }
-  const ascApiKeyPath = await promptForAscApiKeyPathAsync(ctx, roles);
+  const ascApiKeyPath = await promptForAscApiKeyPathAsync(ctx);
  const { keyP8Path, keyId, issuerId } = ascApiKeyPath;
  return { keyP8: await fs.readFile(keyP8Path, 'utf-8'), keyId, issuerId };
 }

-async function promptForKeyP8AndIdAsync(
-  roles: UserRole[]
-): Promise<Pick<AscApiKeyPath, 'keyP8Path' | 'keyId'>> {
-  const rolesStringified = roles.map(r => r.toString()).join(', ');
-  const isPlural = roles.length > 1;
+async function promptForKeyP8AndIdAsync(): Promise<Pick<AscApiKeyPath, 'keyP8Path' | 'keyId'>> {
  Log.log(
    chalk.bold(
-      `An App Store Connect Api key with the ${rolesStringified} role${
-        isPlural ? 's' : ''
-      } is required to upload your app to the Apple App Store Connect`
+      'An App Store Connect Api key is required to upload your app to the Apple App Store Connect'
    )
  );
  Log.log(
@@ -261,16 +241,13 @@ export function sortAscApiKeysByUpdatedAtDesc(
 }

 export function formatAscApiKey(ascApiKey: AppStoreConnectApiKeyFragment): string {
-  const { keyIdentifier, appleTeam, roles, name, updatedAt } = ascApiKey;
+  const { keyIdentifier, appleTeam, name, updatedAt } = ascApiKey;
  let line: string = '';
  line += `Key ID: ${keyIdentifier}`;

  if (name) {
    line += chalk.gray(`\n    Name: ${name}`);
  }
-  if (roles && roles.length > 0) {
-    line += chalk.gray(`\n    Roles: ${roles.join(', ')}`);
-  }
  if (appleTeam) {
    line += chalk.gray(`\n    ${formatAppleTeam(appleTeam)}`);
  }
@@ -1,9 +1,7 @@
+import { resolveAppleTeamIfAuthenticatedAsync } from './AppleTeamUtils';
 import { AppStoreApiKeyPurpose } from './AscApiKeyUtils';
-import { ChooseAssociatedAppleTeamId } from './ChooseAssociatedAppleTeamId';
-import { UpdateAppleTeamInfo } from './UpdateAppleTeamInfo';
 import {
  AppStoreConnectApiKeyFragment,
-  AppleTeamFragment,
  CommonIosAppCredentialsFragment,
 } from '../../../graphql/generated';
 import Log from '../../../log';
@@ -18,15 +16,12 @@ export class AssignAscApiKey {
    ascApiKey: AppStoreConnectApiKeyFragment,
    purpose: AppStoreApiKeyPurpose
  ): Promise<CommonIosAppCredentialsFragment> {
-    const [ascApiKeyWithAppleTeam, appleTeam] = await this.ensureKeyHasAppleTeamInfoAsync(
-      ctx,
-      ascApiKey
-    );
-
+    const appleTeam =
+      (await resolveAppleTeamIfAuthenticatedAsync(ctx, this.app)) ?? ascApiKey.appleTeam ?? null;
    const appCredentials = await ctx.ios.createOrGetIosAppCredentialsWithCommonFieldsAsync(
      ctx.graphqlClient,
      this.app,
-      { appleTeam }
+      { appleTeam: appleTeam ?? undefined }
    );
    let updatedAppCredentials;
    if (purpose === AppStoreApiKeyPurpose.SUBMISSION_SERVICE) {
@@ -34,15 +29,7 @@ export class AssignAscApiKey {
        ctx.graphqlClient,
        appCredentials,
        {
-          ascApiKeyIdForSubmissions: ascApiKeyWithAppleTeam.id,
-        }
-      );
-    } else if (purpose === AppStoreApiKeyPurpose.BUILD_SERVICE) {
-      updatedAppCredentials = await ctx.ios.updateIosAppCredentialsAsync(
-        ctx.graphqlClient,
-        appCredentials,
-        {
-          ascApiKeyIdForBuilds: ascApiKeyWithAppleTeam.id,
+          ascApiKeyIdForSubmissions: ascApiKey.id,
        }
      );
    } else {
@@ -53,28 +40,4 @@ export class AssignAscApiKey {
    );
    return updatedAppCredentials;
  }
-
-  private async ensureKeyHasAppleTeamInfoAsync(
-    ctx: CredentialsContext,
-    ascApiKey: AppStoreConnectApiKeyFragment
-  ): Promise<[AppStoreConnectApiKeyFragment, AppleTeamFragment]> {
-    let appleTeamIdentifier = ascApiKey.appleTeam?.appleTeamIdentifier;
-    if (!appleTeamIdentifier) {
-      const chooseAssociatedAppleTeamIdAction = new ChooseAssociatedAppleTeamId(
-        'App Store Connect API Key'
-      );
-      appleTeamIdentifier = await chooseAssociatedAppleTeamIdAction.runAsync(ctx);
-    }
-    const updateAppleTeamAction = new UpdateAppleTeamInfo(this.app.account, appleTeamIdentifier);
-    const appleTeam = await updateAppleTeamAction.runAsync(ctx);
-    if (!ascApiKey.appleTeam) {
-      const updatedAscApiKey = await ctx.ios.updateAscApiKeyAsync(
-        ctx.graphqlClient,
-        ascApiKey,
-        appleTeam
-      );
-      return [updatedAscApiKey, appleTeam];
-    }
-    return [ascApiKey, appleTeam];
-  }
 }
@@ -1,48 +0,0 @@
-import { Teams } from '@expo/apple-utils';
-
-import { promptAsync } from '../../../prompts';
-import { CredentialsContext } from '../../context';
-
-export class ChooseAssociatedAppleTeamId {
-  constructor(private associatedCredential: string) {}
-
-  public async runAsync(ctx: CredentialsContext): Promise<string> {
-    if (!ctx.appStore.authCtx) {
-      return await this.promptForAppleTeamIdAsync();
-    }
-
-    const teams = await Teams.getTeamsAsync();
-    const chosenTeamId = await this.promptForAppleTeamIdFromDeveloperPortalAsync(
-      teams.map(team => ({ prettyName: `${team.name} (${team.type})`, teamId: team.teamId }))
-    );
-    return chosenTeamId ?? (await this.promptForAppleTeamIdAsync());
-  }
-
-  private async promptForAppleTeamIdFromDeveloperPortalAsync(
-    teamChoices: { prettyName: string; teamId: string }[]
-  ): Promise<string | null> {
-    if (teamChoices.length === 0) {
-      return null;
-    }
-    const { appleTeamId } = await promptAsync({
-      type: 'select',
-      message: `Select the Apple Team associated with your ${this.associatedCredential}:`,
-      name: 'appleTeamId',
-      choices: [
-        ...teamChoices.map(({ prettyName, teamId }) => ({ title: prettyName, value: teamId })),
-        { title: 'None of the above', value: null },
-      ],
-    });
-    return appleTeamId;
-  }
-
-  private async promptForAppleTeamIdAsync(): Promise<string> {
-    const { appleTeamId } = await promptAsync({
-      type: 'text',
-      name: 'appleTeamId',
-      message: `Input the Apple Team ID associated with your ${this.associatedCredential}:`,
-      validate: (val: string) => val !== '',
-    });
-    return appleTeamId;
-  }
-}
@@ -5,18 +5,15 @@ import {
  AppleDistributionCertificateFragment,
  AppleProvisioningProfileFragment,
 } from '../../../graphql/generated';
-import Log, { learnMore } from '../../../log';
+import Log from '../../../log';
 import { ora } from '../../../ora';
 import { getApplePlatformFromTarget } from '../../../project/ios/target';
 import { CredentialsContext } from '../../context';
-import {
-  ForbidCredentialModificationError,
-  InsufficientAuthenticationNonInteractiveError,
-} from '../../errors';
+import { MissingCredentialsNonInteractiveError } from '../../errors';
 import { AppleProvisioningProfileMutationResult } from '../api/graphql/mutations/AppleProvisioningProfileMutation';
 import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
 import { ProvisioningProfileStoreInfo } from '../appstore/Credentials.types';
-import { AuthCtx, AuthenticationMode } from '../appstore/authenticateTypes';
+import { AuthCtx } from '../appstore/authenticateTypes';
 import { Target } from '../types';

 export class ConfigureProvisioningProfile {
@@ -30,18 +27,9 @@ export class ConfigureProvisioningProfile {
  public async runAsync(
    ctx: CredentialsContext
  ): Promise<AppleProvisioningProfileMutationResult | null> {
-    if (ctx.freezeCredentials) {
-      throw new ForbidCredentialModificationError(
-        'Remove the --freeze-credentials flag to configure a Provisioning Profile.'
-      );
-    } else if (
-      ctx.nonInteractive &&
-      ctx.appStore.defaultAuthenticationMode !== AuthenticationMode.API_KEY
-    ) {
-      throw new InsufficientAuthenticationNonInteractiveError(
-        `In order to configure your Provisioning Profile, authentication with an ASC API key is required in non-interactive mode. ${learnMore(
-          'https://docs.expo.dev/build/building-on-ci/#optional-provide-an-asc-api-token-for-your-apple-team'
-        )}`
+    if (ctx.nonInteractive) {
+      throw new MissingCredentialsNonInteractiveError(
+        'Configuring Provisioning Profiles is only supported in interactive mode.'
      );
    }
    const { developerPortalIdentifier, provisioningProfile } = this.originalProvisioningProfile;
@@ -58,7 +46,7 @@ export class ConfigureProvisioningProfile {
      return null;
    }

-    const applePlatform = getApplePlatformFromTarget(this.target);
+    const applePlatform = await getApplePlatformFromTarget(this.target);
    const profilesFromApple = await ctx.appStore.listProvisioningProfilesAsync(
      this.app.bundleIdentifier,
      applePlatform
@@ -1,17 +1,6 @@
-import {
-  AppStoreApiKeyPurpose,
-  PURPOSE_TO_ROLES,
-  provideOrGenerateAscApiKeyAsync,
-} from './AscApiKeyUtils';
-import { ChooseAssociatedAppleTeamId } from './ChooseAssociatedAppleTeamId';
-import { UpdateAppleTeamInfo } from './UpdateAppleTeamInfo';
-import {
-  AccountFragment,
-  AppStoreConnectApiKeyFragment,
-  AppleTeamFragment,
-} from '../../../graphql/generated';
+import { AppStoreApiKeyPurpose, provideOrGenerateAscApiKeyAsync } from './AscApiKeyUtils';
+import { AccountFragment, AppStoreConnectApiKeyFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
-import { MinimalAscApiKey } from '../credentials';

 export class CreateAscApiKey {
  constructor(private account: AccountFragment) {}
@@ -23,32 +12,8 @@ export class CreateAscApiKey {
    if (ctx.nonInteractive) {
      throw new Error(`A new App Store Connect API Key cannot be created in non-interactive mode.`);
    }
-    const roles = PURPOSE_TO_ROLES[purpose];
-    if (!roles) {
-      throw new Error(`Unsupported purpose: ${purpose}`);
-    }

-    const ascApiKey = await provideOrGenerateAscApiKeyAsync(ctx, roles);
-    const appleTeam = await this.ensureKeyHasAppleTeamInfoAsync(ctx, ascApiKey);
-
-    return await ctx.ios.createAscApiKeyAsync(ctx.graphqlClient, this.account, {
-      ...ascApiKey,
-      teamId: appleTeam.appleTeamIdentifier,
-    });
-  }
-
-  private async ensureKeyHasAppleTeamInfoAsync(
-    ctx: CredentialsContext,
-    ascApiKey: MinimalAscApiKey
-  ): Promise<AppleTeamFragment> {
-    let appleTeamIdentifier = ascApiKey.teamId;
-    if (!appleTeamIdentifier) {
-      const chooseAssociatedAppleTeamIdAction = new ChooseAssociatedAppleTeamId(
-        'App Store Connect API Key'
-      );
-      appleTeamIdentifier = await chooseAssociatedAppleTeamIdAction.runAsync(ctx);
-    }
-    const updateAppleTeamAction = new UpdateAppleTeamInfo(this.account, appleTeamIdentifier);
-    return await updateAppleTeamAction.runAsync(ctx);
+    const ascApiKey = await provideOrGenerateAscApiKeyAsync(ctx, purpose);
+    return await ctx.ios.createAscApiKeyAsync(ctx.graphqlClient, this.account, ascApiKey);
  }
 }
@@ -4,17 +4,14 @@ import nullthrows from 'nullthrows';
 import { resolveAppleTeamIfAuthenticatedAsync } from './AppleTeamUtils';
 import { generateProvisioningProfileAsync } from './ProvisioningProfileUtils';
 import { AppleDistributionCertificateFragment } from '../../../graphql/generated';
-import Log, { learnMore } from '../../../log';
+import Log from '../../../log';
 import { CredentialsContext } from '../../context';
-import {
-  ForbidCredentialModificationError,
-  InsufficientAuthenticationNonInteractiveError,
-} from '../../errors';
+import { MissingCredentialsNonInteractiveError } from '../../errors';
 import { askForUserProvidedAsync } from '../../utils/promptForCredentials';
 import { AppleProvisioningProfileMutationResult } from '../api/graphql/mutations/AppleProvisioningProfileMutation';
 import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
 import { ProvisioningProfile } from '../appstore/Credentials.types';
-import { AuthCtx, AuthenticationMode } from '../appstore/authenticateTypes';
+import { AuthCtx } from '../appstore/authenticateTypes';
 import { provisioningProfileSchema } from '../credentials';
 import { Target } from '../types';

@@ -26,18 +23,9 @@ export class CreateProvisioningProfile {
  ) {}

  async runAsync(ctx: CredentialsContext): Promise<AppleProvisioningProfileMutationResult> {
-    if (ctx.freezeCredentials) {
-      throw new ForbidCredentialModificationError(
-        'Run this command again without the --freeze-credentials flag in order to generate a new Provisioning Profile.'
-      );
-    } else if (
-      ctx.nonInteractive &&
-      ctx.appStore.defaultAuthenticationMode !== AuthenticationMode.API_KEY
-    ) {
-      throw new InsufficientAuthenticationNonInteractiveError(
-        `In order to generate a new Provisioning Profile, authentication with an ASC API key is required in non-interactive mode. ${learnMore(
-          'https://docs.expo.dev/build/building-on-ci/#optional-provide-an-asc-api-token-for-your-apple-team'
-        )}`
+    if (ctx.nonInteractive) {
+      throw new MissingCredentialsNonInteractiveError(
+        'Creating Provisioning Profiles is only supported in interactive mode.'
      );
    }
    const appleAuthCtx = await ctx.appStore.ensureAuthenticatedAsync();
@@ -61,31 +49,16 @@ export class CreateProvisioningProfile {
    return provisioningProfileMutationResult;
  }

-  private async maybeGetUserProvidedAsync(
-    ctx: CredentialsContext
-  ): Promise<ProvisioningProfile | null> {
-    if (ctx.nonInteractive) {
-      return null;
-    }
+  private async provideOrGenerateAsync(
+    ctx: CredentialsContext,
+    appleAuthCtx: AuthCtx
+  ): Promise<ProvisioningProfile> {
    const userProvided = await askForUserProvidedAsync(provisioningProfileSchema);
    if (userProvided) {
      // userProvided profiles don't come with ProvisioningProfileId's (only accessible from Apple Portal API)
      Log.warn('Provisioning profile: Unable to validate specified profile.');
      return userProvided;
    }
-    return null;
-  }
-
-  private async provideOrGenerateAsync(
-    ctx: CredentialsContext,
-    appleAuthCtx: AuthCtx
-  ): Promise<ProvisioningProfile> {
-    const maybeUserProvided = await this.maybeGetUserProvidedAsync(ctx);
-    if (maybeUserProvided) {
-      // userProvided profiles don't come with ProvisioningProfileId's (only accessible from Apple Portal API)
-      Log.warn('Provisioning profile: Unable to validate specified profile.');
-      return maybeUserProvided;
-    }
    assert(
      this.distributionCertificate.certificateP12,
      'Distribution Certificate must have p12 certificate'
@@ -48,13 +48,8 @@ export function formatDistributionCertificate(
    buildCredentials => buildCredentials.iosAppCredentials.app
  );
  if (apps.length) {
-    // iosAppBuildCredentialsList is capped at 20 on www
-    const appFullNames = apps
-      .map(app => app.fullName)
-      .slice(0, 19)
-      .join(',');
-    const andMaybeMore = apps.length > 19 ? ' (and more)' : '';
-    line += chalk.gray(`\n    📲 Used by: ${appFullNames}${andMaybeMore}`);
+    const appFullNames = apps.map(app => app.fullName).join(',');
+    line += chalk.gray(`\n    📲 Used by: ${appFullNames}`);
  }

  if (validSerialNumbers?.includes(serialNumber)) {
@@ -259,10 +254,6 @@ function formatDistributionCertificateFromApple(
  const { name, status, id, expires, created, ownerName, serialNumber } = appleInfo;
  const expiresDate = new Date(expires * 1000).toDateString();
  const createdDate = new Date(created * 1000).toDateString();
-  return [
-    `🍏 ${chalk.bold(name)} (${status})`,
-    `${chalk.bold('ID:')} ${id} ${chalk.bold('Serial Number:')} ${serialNumber}`,
-    `${chalk.bold('Apple Team:')} ${appleInfo.ownerId} (${ownerName})`,
-    `${chalk.bold('Expires:')} ${expiresDate} ${chalk.bold('Created:')} ${createdDate}`,
-  ].join('\n\t');
+  return `${name} (${status}) - Cert ID: ${id}, Serial number: ${serialNumber}, Team ID: ${appleInfo.ownerId}, Team name: ${ownerName}
+    expires: ${expiresDate}, created: ${createdDate}`;
 }
@@ -1,32 +0,0 @@
-import { AppStoreConnectApiKeyFragment } from '../../../graphql/generated';
-import Log from '../../../log';
-import { CredentialsContext } from '../../context';
-import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
-
-export class GetAscApiKey {
-  static async getForBuildServiceAsync(
-    app: AppLookupParams,
-    ctx: CredentialsContext
-  ): Promise<AppStoreConnectApiKeyFragment | null> {
-    const appCredentials = await ctx.ios.getIosAppCredentialsWithCommonFieldsAsync(
-      ctx.graphqlClient,
-      app
-    );
-    const ascApiKey = appCredentials?.appStoreConnectApiKeyForBuilds;
-    if (!ascApiKey) {
-      return null;
-    }
-    const appleTeam = ascApiKey.appleTeam;
-    const appleTeamIdentifier = appleTeam?.appleTeamIdentifier;
-    const appleTeamType = appleTeam?.appleTeamType;
-    const hasAppleTeamInfo = !!appleTeamIdentifier && !!appleTeamType;
-    if (!hasAppleTeamInfo) {
-      Log.warn(
-        `App Store Connect API Key for EAS Build is missing Apple Team information. Run "eas credentials" and select "Use an existing API Key" to update the missing information.`
-      );
-      return null;
-    }
-
-    return ascApiKey;
-  }
-}
@@ -185,13 +185,8 @@ export function formatPushKey(

  const apps = pushKey.iosAppCredentialsList.map(appCredentials => appCredentials.app);
  if (apps.length) {
-    // iosAppCredentialsList is capped at 20 on www
-    const appFullNames = apps
-      .map(app => app.fullName)
-      .slice(0, 19)
-      .join(',');
-    const andMaybeMore = apps.length > 19 ? ' (and more)' : '';
-    line += chalk.gray(`\n    📲 Used by: ${appFullNames}${andMaybeMore}`);
+    const appFullNames = apps.map(app => app.fullName).join(',');
+    line += chalk.gray(`\n    📲 Used by: ${appFullNames}`);
  }

  if (validPushKeyIdentifiers?.includes(keyIdentifier)) {
@@ -34,20 +34,14 @@ export class RemoveDistributionCertificate {
      buildCredentials => buildCredentials.iosAppCredentials.app
    );
    if (apps.length !== 0) {
-      // iosAppBuildCredentialsList is capped at 20 on www
-      const appFullNames = apps
-        .map(app => app.fullName)
-        .slice(0, 19)
-        .join(',');
-      const andMaybeMore = apps.length > 19 ? ' (and more)' : '';
-
+      const appFullNames = apps.map(app => app.fullName).join(',');
      if (ctx.nonInteractive) {
        throw new Error(
-          `Certificate is currently used by ${appFullNames}${andMaybeMore} and cannot be deleted in non-interactive mode.`
+          `Certificate is currently used by ${appFullNames} and cannot be deleted in non-interactive mode.`
        );
      }
      const confirm = await confirmAsync({
-        message: `You are removing certificate used by ${appFullNames}${andMaybeMore}. Do you want to continue?`,
+        message: `You are removing certificate used by ${appFullNames}. Do you want to continue?`,
      });
      if (!confirm) {
        Log.log('Aborting');
@@ -27,14 +27,9 @@ export class RemovePushKey {

    const apps = this.pushKey.iosAppCredentialsList.map(appCredentials => appCredentials.app);
    if (apps.length !== 0) {
-      // iosAppCredentialsList is capped at 20 on www
-      const appFullNames = apps
-        .map(app => app.fullName)
-        .slice(0, 19)
-        .join(',');
-      const andMaybeMore = apps.length > 19 ? ' (and more)' : '';
+      const appFullNames = apps.map(app => app.fullName).join(',');
      const confirm = await confirmAsync({
-        message: `Removing this push key will disable push notifications for ${appFullNames}${andMaybeMore}. Do you want to continue?`,
+        message: `Removing this push key will disable push notifications for ${appFullNames}. Do you want to continue?`,
      });
      if (!confirm) {
        Log.log('Aborting');
@@ -110,13 +110,10 @@ export class SetUpAscApiKey {
      ctx.graphqlClient,
      this.app
    );
-    if (purpose === AppStoreApiKeyPurpose.SUBMISSION_SERVICE) {
-      return !!appCredentials?.appStoreConnectApiKeyForSubmissions;
-    } else if (purpose === AppStoreApiKeyPurpose.BUILD_SERVICE) {
-      return !!appCredentials?.appStoreConnectApiKeyForBuilds;
-    } else {
+    if (purpose !== AppStoreApiKeyPurpose.SUBMISSION_SERVICE) {
      throw new Error(`App Store Connect API Key setup is not yet supported for ${purpose}.`);
    }
+    return !!appCredentials?.appStoreConnectApiKeyForSubmissions;
  }

  private async processChoicesAsync(
@@ -15,17 +15,12 @@ import {
  IosAppBuildCredentialsFragment,
  IosDistributionType,
 } from '../../../graphql/generated';
-import { learnMore } from '../../../log';
 import { getApplePlatformFromTarget } from '../../../project/ios/target';
 import { confirmAsync } from '../../../prompts';
 import { CredentialsContext } from '../../context';
-import {
-  ForbidCredentialModificationError,
-  InsufficientAuthenticationNonInteractiveError,
-} from '../../errors';
+import { MissingCredentialsNonInteractiveError } from '../../errors';
 import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
 import { ProvisioningProfileStoreInfo } from '../appstore/Credentials.types';
-import { AuthenticationMode } from '../appstore/authenticateTypes';
 import { Target } from '../types';
 import { validateProvisioningProfileAsync } from '../validators/validateProvisioningProfile';

@@ -107,18 +102,9 @@ export class SetUpProvisioningProfile {
    if (areBuildCredentialsSetup) {
      return nullthrows(await getBuildCredentialsAsync(ctx, this.app, this.distributionType));
    }
-    if (ctx.freezeCredentials) {
-      throw new ForbidCredentialModificationError(
-        'Provisioning profile is not configured correctly. Remove the --freeze-credentials flag to configure it.'
-      );
-    } else if (
-      ctx.nonInteractive &&
-      ctx.appStore.defaultAuthenticationMode !== AuthenticationMode.API_KEY
-    ) {
-      throw new InsufficientAuthenticationNonInteractiveError(
-        `In order to configure your Provisioning Profile, authentication with an ASC API key is required in non-interactive mode. ${learnMore(
-          'https://docs.expo.dev/build/building-on-ci/#optional-provide-an-asc-api-token-for-your-apple-team'
-        )}`
+    if (ctx.nonInteractive) {
+      throw new MissingCredentialsNonInteractiveError(
+        'Provisioning profile is not configured correctly. Run this command again in interactive mode.'
      );
    }

@@ -141,18 +127,11 @@ export class SetUpProvisioningProfile {
      return await this.assignNewAndDeleteOldProfileAsync(ctx, distCert, currentProfile);
    }

-    const isNonInteractiveOrUserDidConfirmAsync = async (): Promise<boolean> => {
-      if (ctx.nonInteractive) {
-        return true;
-      }
-      return await confirmAsync({
-        message: `${formatProvisioningProfileFromApple(
-          currentProfileFromServer
-        )} \n  Would you like to reuse the original profile?`,
-      });
-    };
-
-    const confirm = await isNonInteractiveOrUserDidConfirmAsync();
+    const confirm = await confirmAsync({
+      message: `${formatProvisioningProfileFromApple(
+        currentProfileFromServer
+      )} \n  Would you like to reuse the original profile?`,
+    });
    if (!confirm) {
      return await this.assignNewAndDeleteOldProfileAsync(ctx, distCert, currentProfile);
    }
@@ -1,88 +0,0 @@
-import { Teams } from '@expo/apple-utils';
-
-import { AccountFragment, AppleTeamFragment, AppleTeamType } from '../../../graphql/generated';
-import { promptAsync } from '../../../prompts';
-import { CredentialsContext } from '../../context';
-import { AppleTeamQuery } from '../api/graphql/queries/AppleTeamQuery';
-
-/* *
- * Update the Apple Team for the app.
- * If the user is logged in, we sync the Team info from the Developer Portal
- * Else we ask the user to choose their Team Type (Company/Organization, Individual, In-House)
- */
-export class UpdateAppleTeamInfo {
-  constructor(
-    private account: AccountFragment,
-    private appleTeamIdentifier: string
-  ) {}
-
-  public async runAsync(ctx: CredentialsContext): Promise<AppleTeamFragment> {
-    const appleTeam = await AppleTeamQuery.getByAppleTeamIdentifierAsync(
-      ctx.graphqlClient,
-      this.account.id,
-      this.appleTeamIdentifier
-    );
-    const hasAppleTeamInfo = !!appleTeam && !!appleTeam.appleTeamType;
-    if (hasAppleTeamInfo) {
-      return appleTeam;
-    }
-
-    if (!ctx.appStore.authCtx) {
-      return await this.promptAndUpdateAppleTeamTypeAsync(ctx);
-    }
-    const teams = await Teams.getTeamsAsync();
-    const team = teams.find(t => t.teamId === this.appleTeamIdentifier);
-    if (!team) {
-      return await this.promptAndUpdateAppleTeamTypeAsync(ctx);
-    }
-    const { teamId, type, name } = team;
-    const teamType = appStoreTeamTypeToEnum(type);
-    return await ctx.ios.createOrUpdateExistingAppleTeamAsync(ctx.graphqlClient, this.account, {
-      appleTeamIdentifier: teamId,
-      appleTeamName: name,
-      appleTeamType: teamType,
-    });
-  }
-
-  private async promptAndUpdateAppleTeamTypeAsync(
-    ctx: CredentialsContext
-  ): Promise<AppleTeamFragment> {
-    if (ctx.nonInteractive) {
-      throw new Error(
-        'Unable to get Apple Team information in non-interactive mode. Please re-run with interactive mode.'
-      );
-    }
-    const teamType = await promptForAppleTeamTypeAsync();
-    return await ctx.ios.createOrUpdateExistingAppleTeamAsync(ctx.graphqlClient, this.account, {
-      appleTeamIdentifier: this.appleTeamIdentifier,
-      appleTeamType: teamType,
-    });
-  }
-}
-
-function appStoreTeamTypeToEnum(
-  teamType: 'In-House' | 'Company/Organization' | 'Individual' | string
-): AppleTeamType | null {
-  if (teamType === 'In-House') {
-    return AppleTeamType.InHouse;
-  } else if (teamType === 'Company/Organization') {
-    return AppleTeamType.CompanyOrOrganization;
-  } else if (teamType === 'Individual') {
-    return AppleTeamType.Individual;
-  }
-  return null;
-}
-
-async function promptForAppleTeamTypeAsync(): Promise<AppleTeamType> {
-  const { appleTeamType } = await promptAsync({
-    type: 'select',
-    message: 'Select your Apple Team Type:',
-    name: 'appleTeamType',
-    choices: [
-      { title: 'Enterprise', value: AppleTeamType.InHouse },
-      { title: 'Company/Organization', value: AppleTeamType.CompanyOrOrganization },
-      { title: 'Individual', value: AppleTeamType.Individual },
-    ],
-  });
-  return appleTeamType;
-}
@@ -1,15 +1,21 @@
-import { UserRole } from '@expo/apple-utils';
-
 import { promptAsync } from '../../../../prompts';
 import { getAppstoreMock, testAuthCtx } from '../../../__tests__/fixtures-appstore';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { testAscApiKey } from '../../../__tests__/fixtures-ios';
 import { getCredentialsFromUserAsync } from '../../../utils/promptForCredentials';
-import { getAscApiKeyName, promptForAscApiKeyPathAsync } from '../AscApiKeyUtils';
+import {
+  AppStoreApiKeyPurpose,
+  getAscApiKeyName,
+  promptForAscApiKeyPathAsync,
+} from '../AscApiKeyUtils';

 jest.mock('../../../../prompts');
 jest.mock('../../../utils/promptForCredentials');

+function enumKeys<O extends object, K extends keyof O = keyof O>(obj: O): K[] {
+  return Object.keys(obj) as K[];
+}
+
 afterEach(() => {
  jest.mocked(promptAsync).mockClear();
  jest.mocked(getCredentialsFromUserAsync).mockClear();
@@ -18,8 +24,11 @@ afterEach(() => {
 describe(getAscApiKeyName, () => {
  // Apple enforces a 30 char limit on this name
  it('produces a name under 30 chars', async () => {
-    const name = getAscApiKeyName();
-    expect(name.length < 30).toBe(true);
+    for (const value of enumKeys(AppStoreApiKeyPurpose)) {
+      const purpose = AppStoreApiKeyPurpose[value];
+      const name = getAscApiKeyName(purpose);
+      expect(name.length < 30).toBe(true);
+    }
  });
 });

@@ -42,7 +51,7 @@ describe(promptForAscApiKeyPathAsync, () => {
        authCtx: null,
      },
    });
-    const ascApiKeyPath = await promptForAscApiKeyPathAsync(ctx, [UserRole.ADMIN]);
+    const ascApiKeyPath = await promptForAscApiKeyPathAsync(ctx);
    expect(ascApiKeyPath).toEqual({
      keyId: 'test-key-id',
      issuerId: 'test-issuer-id',
@@ -67,7 +76,7 @@ describe(promptForAscApiKeyPathAsync, () => {
        getAscApiKeyAsync: jest.fn(() => testAscApiKey),
      },
    });
-    const ascApiKeyPath = await promptForAscApiKeyPathAsync(ctx, [UserRole.ADMIN]);
+    const ascApiKeyPath = await promptForAscApiKeyPathAsync(ctx);
    expect(ascApiKeyPath).toEqual({
      keyId: 'test-key-id',
      issuerId: 'test-issuer-id-from-apple',
@@ -11,11 +11,7 @@ import {
  testTarget,
  testTargets,
 } from '../../../__tests__/fixtures-ios';
-import {
-  ForbidCredentialModificationError,
-  InsufficientAuthenticationNonInteractiveError,
-} from '../../../errors';
-import { AuthenticationMode } from '../../appstore/authenticateTypes';
+import { MissingCredentialsNonInteractiveError } from '../../../errors';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { ConfigureProvisioningProfile } from '../ConfigureProvisioningProfile';

@@ -28,18 +24,15 @@ describe('ConfigureProvisioningProfile', () => {
  beforeEach(() => {
    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
  });
-  const testCases = ['NON_INTERACTIVE', 'INTERACTIVE'];
-  test.each(testCases)('configures a Provisioning Profile in %s Mode', async mode => {
+  it('configures a Provisioning Profile in Interactive Mode', async () => {
    const mockProvisioningProfileFromApple = {
      provisioningProfileId: testProvisioningProfileFragment.developerPortalIdentifier,
      provisioningProfile: testProvisioningProfileFragment.provisioningProfile,
    };
    const ctx = createCtxMock({
-      nonInteractive: mode === 'NON_INTERACTIVE',
+      nonInteractive: false,
      appStore: {
        ...getAppstoreMock(),
-        defaultAuthenticationMode:
-          mode === 'NON_INTERACTIVE' ? AuthenticationMode.API_KEY : AuthenticationMode.USER,
        ensureAuthenticatedAsync: jest.fn(() => testAuthCtx),
        authCtx: testAuthCtx,
        createProvisioningProfileAsync: jest.fn(() => testProvisioningProfile),
@@ -64,30 +57,7 @@ describe('ConfigureProvisioningProfile', () => {
    // expect provisioning profile not to be updated on apple portal
    expect(jest.mocked(ctx.appStore.useExistingProvisioningProfileAsync).mock.calls.length).toBe(1);
  });
-  it('errors with --freeze-credentials flag', async () => {
-    const ctx = createCtxMock({
-      freezeCredentials: true,
-    });
-    const appLookupParams = await getAppLookupParamsFromContextAsync(
-      ctx,
-      findApplicationTarget(testTargets)
-    );
-    const provProfConfigurator = new ConfigureProvisioningProfile(
-      appLookupParams,
-      testTarget,
-      testDistCertFragmentNoDependencies,
-      testProvisioningProfileFragment
-    );
-    await expect(provProfConfigurator.runAsync(ctx)).rejects.toThrowError(
-      ForbidCredentialModificationError
-    );
-
-    // expect provisioning profile not to be updated on expo servers
-    expect(jest.mocked(ctx.ios.updateProvisioningProfileAsync).mock.calls.length).toBe(0);
-    // expect provisioning profile not to be updated on apple portal
-    expect(jest.mocked(ctx.appStore.useExistingProvisioningProfileAsync).mock.calls.length).toBe(0);
-  });
-  it('errors with wrong authentication type in nonInteractive mode', async () => {
+  it('errors in Non Interactive Mode', async () => {
    const ctx = createCtxMock({
      nonInteractive: true,
    });
@@ -102,7 +72,7 @@ describe('ConfigureProvisioningProfile', () => {
      testProvisioningProfileFragment
    );
    await expect(provProfConfigurator.runAsync(ctx)).rejects.toThrowError(
-      InsufficientAuthenticationNonInteractiveError
+      MissingCredentialsNonInteractiveError
    );

    // expect provisioning profile not to be updated on expo servers
@@ -10,11 +10,7 @@ import {
  testTarget,
  testTargets,
 } from '../../../__tests__/fixtures-ios';
-import {
-  ForbidCredentialModificationError,
-  InsufficientAuthenticationNonInteractiveError,
-} from '../../../errors';
-import { AuthenticationMode } from '../../appstore/authenticateTypes';
+import { MissingCredentialsNonInteractiveError } from '../../../errors';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { CreateProvisioningProfile } from '../CreateProvisioningProfile';

@@ -26,15 +22,11 @@ describe('CreateProvisioningProfile', () => {
  beforeEach(() => {
    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
  });
-
-  const testCases = ['NON_INTERACTIVE', 'INTERACTIVE'];
-  test.each(testCases)('creates a Provisioning Profile in in %s Mode', async mode => {
+  it('creates a Provisioning Profile in Interactive Mode', async () => {
    const ctx = createCtxMock({
-      nonInteractive: mode === 'NON_INTERACTIVE',
+      nonInteractive: false,
      appStore: {
        ...getAppstoreMock(),
-        defaultAuthenticationMode:
-          mode === 'NON_INTERACTIVE' ? AuthenticationMode.API_KEY : AuthenticationMode.USER,
        ensureAuthenticatedAsync: jest.fn(() => testAuthCtx),
        authCtx: testAuthCtx,
        createProvisioningProfileAsync: jest.fn(() => testProvisioningProfile),
@@ -56,29 +48,7 @@ describe('CreateProvisioningProfile', () => {
    // expect provisioning profile to be created on apple portal
    expect(jest.mocked(ctx.appStore.createProvisioningProfileAsync).mock.calls.length).toBe(1);
  });
-  it('errors with --freeze-credentials flag', async () => {
-    const ctx = createCtxMock({
-      freezeCredentials: true,
-    });
-    const appLookupParams = await getAppLookupParamsFromContextAsync(
-      ctx,
-      findApplicationTarget(testTargets)
-    );
-    const createProvProfAction = new CreateProvisioningProfile(
-      appLookupParams,
-      testTarget,
-      testDistCertFragmentNoDependencies
-    );
-    await expect(createProvProfAction.runAsync(ctx)).rejects.toThrowError(
-      ForbidCredentialModificationError
-    );
-
-    // expect provisioning profile not to be created on expo servers
-    expect(jest.mocked(ctx.ios.createProvisioningProfileAsync).mock.calls.length).toBe(0);
-    // expect provisioning profile not to be created on apple portal
-    expect(jest.mocked(ctx.appStore.createProvisioningProfileAsync).mock.calls.length).toBe(0);
-  });
-  it('errors with wrong authentication type in nonInteractive mode', async () => {
+  it('errors in Non Interactive Mode', async () => {
    const ctx = createCtxMock({
      nonInteractive: true,
    });
@@ -92,7 +62,7 @@ describe('CreateProvisioningProfile', () => {
      testDistCertFragmentNoDependencies
    );
    await expect(createProvProfAction.runAsync(ctx)).rejects.toThrowError(
-      InsufficientAuthenticationNonInteractiveError
+      MissingCredentialsNonInteractiveError
    );

    // expect provisioning profile not to be created on expo servers
@@ -15,11 +15,7 @@ import {
  testTarget,
  testTargets,
 } from '../../../__tests__/fixtures-ios';
-import {
-  ForbidCredentialModificationError,
-  InsufficientAuthenticationNonInteractiveError,
-} from '../../../errors';
-import { AuthenticationMode } from '../../appstore/authenticateTypes';
+import { MissingCredentialsNonInteractiveError } from '../../../errors';
 import { validateProvisioningProfileAsync } from '../../validators/validateProvisioningProfile';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { SetUpProvisioningProfile } from '../SetUpProvisioningProfile';
@@ -36,185 +32,32 @@ describe('SetUpProvisioningProfile', () => {
  beforeEach(() => {
    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
  });
-
-  const testCases = ['NON_INTERACTIVE', 'INTERACTIVE'];
-  test.each(testCases)(
-    'repairs existing Provisioning Profile with bad build credentials in %s Mode',
-    async mode => {
-      jest.mocked(validateProvisioningProfileAsync).mockImplementation(async () => false);
-      const ctx = createCtxMock({
-        nonInteractive: mode === 'NON_INTERACTIVE',
-        appStore: {
-          ...getAppstoreMock(),
-          defaultAuthenticationMode:
-            mode === 'NON_INTERACTIVE' ? AuthenticationMode.API_KEY : AuthenticationMode.USER,
-          ensureAuthenticatedAsync: jest.fn(() => testAuthCtx),
-          authCtx: testAuthCtx,
-          listProvisioningProfilesAsync: jest.fn(() => [
-            {
-              provisioningProfileId: nullthrows(
-                testCommonIosAppCredentialsFragment.iosAppBuildCredentialsList[0]
-                  .provisioningProfile
-              ).developerPortalIdentifier,
-            },
-          ]),
-        },
-        ios: {
-          ...getNewIosApiMock(),
-          getIosAppCredentialsWithBuildCredentialsAsync: jest.fn(
-            () => testCommonIosAppCredentialsFragment
-          ),
-          createOrGetExistingAppleAppIdentifierAsync: jest.fn(() => testAppleAppIdentifierFragment),
-          createOrUpdateIosAppBuildCredentialsAsync: jest.fn(
-            () => testIosAppBuildCredentialsFragment
-          ),
-        },
-      });
-      const appLookupParams = await getAppLookupParamsFromContextAsync(
-        ctx,
-        findApplicationTarget(testTargets)
-      );
-      const setupProvisioningProfileAction = new SetUpProvisioningProfile(
-        appLookupParams,
-        testTarget,
-        IosDistributionType.AppStore
-      );
-      await setupProvisioningProfileAction.runAsync(ctx);
-
-      // expect build credentials to be created or updated on expo servers
-      expect(jest.mocked(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(
-        1
-      );
-      // expect provisioning profile not to be deleted on expo servers
-      expect(jest.mocked(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(0);
-    }
-  );
-
-  test.each(testCases)(
-    'sets up a new Provisioning Profile with bad build credentials in %s Mode',
-    async mode => {
-      jest.mocked(validateProvisioningProfileAsync).mockImplementation(async () => false);
-      const ctx = createCtxMock({
-        nonInteractive: mode === 'NON_INTERACTIVE',
-        appStore: {
-          ...getAppstoreMock(),
-          defaultAuthenticationMode:
-            mode === 'NON_INTERACTIVE' ? AuthenticationMode.API_KEY : AuthenticationMode.USER,
-          ensureAuthenticatedAsync: jest.fn(() => testAuthCtx),
-          authCtx: testAuthCtx,
-          listProvisioningProfilesAsync: jest.fn(() => []),
-        },
-        ios: {
-          ...getNewIosApiMock(),
-          getIosAppCredentialsWithBuildCredentialsAsync: jest.fn(
-            () => testCommonIosAppCredentialsFragment
-          ),
-          createOrGetExistingAppleAppIdentifierAsync: jest.fn(() => testAppleAppIdentifierFragment),
-        },
-      });
-      const appLookupParams = await getAppLookupParamsFromContextAsync(
-        ctx,
-        findApplicationTarget(testTargets)
-      );
-      const setupProvisioningProfileAction = new SetUpProvisioningProfile(
-        appLookupParams,
-        testTarget,
-        IosDistributionType.AppStore
-      );
-      await setupProvisioningProfileAction.runAsync(ctx);
-
-      // expect build credentials to be created or updated on expo servers
-      expect(jest.mocked(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(
-        1
-      );
-      // expect provisioning profile to be deleted on expo servers
-      expect(jest.mocked(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(1);
-    }
-  );
-
-  test.each(testCases)(
-    'skips setting up a Provisioning Profile with prior build credentials configured properly in %s Mode',
-    async mode => {
-      jest.mocked(validateProvisioningProfileAsync).mockImplementation(async () => true);
-      const ctx = createCtxMock({
-        nonInteractive: mode === 'NON_INTERACTIVE',
-        appStore: {
-          ...getAppstoreMock(),
-          defaultAuthenticationMode:
-            mode === 'NON_INTERACTIVE' ? AuthenticationMode.API_KEY : AuthenticationMode.USER,
-          ensureAuthenticatedAsync: jest.fn(() => testAuthCtx),
-          authCtx: testAuthCtx,
-        },
-        ios: {
-          ...getNewIosApiMock(),
-          getIosAppCredentialsWithBuildCredentialsAsync: jest.fn(
-            () => testCommonIosAppCredentialsFragment
-          ),
-          createOrGetExistingAppleAppIdentifierAsync: jest.fn(() => testAppleAppIdentifierFragment),
-        },
-      });
-      const appLookupParams = await getAppLookupParamsFromContextAsync(
-        ctx,
-        findApplicationTarget(testTargets)
-      );
-      const setupProvisioningProfileAction = new SetUpProvisioningProfile(
-        appLookupParams,
-        testTarget,
-        IosDistributionType.AppStore
-      );
-      await setupProvisioningProfileAction.runAsync(ctx);
-
-      // expect build credentials not to be created or updated on expo servers
-      expect(jest.mocked(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(
-        0
-      );
-      // expect provisioning profile not to be deleted on expo servers
-      expect(jest.mocked(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(0);
-    }
-  );
-
-  test.each(testCases)(
-    'sets up a Provisioning Profile with no prior build credentials configured in %s Mode',
-    async mode => {
-      jest.mocked(validateProvisioningProfileAsync).mockImplementation(async () => false);
-      const ctx = createCtxMock({
-        nonInteractive: mode === 'NON_INTERACTIVE',
-        appStore: {
-          ...getAppstoreMock(),
-          defaultAuthenticationMode:
-            mode === 'NON_INTERACTIVE' ? AuthenticationMode.API_KEY : AuthenticationMode.USER,
-          ensureAuthenticatedAsync: jest.fn(() => testAuthCtx),
-          authCtx: testAuthCtx,
-        },
-        ios: {
-          ...getNewIosApiMock(),
-          createOrGetExistingAppleAppIdentifierAsync: jest.fn(() => testAppleAppIdentifierFragment),
-        },
-      });
-      const appLookupParams = await getAppLookupParamsFromContextAsync(
-        ctx,
-        findApplicationTarget(testTargets)
-      );
-      const setupProvisioningProfileAction = new SetUpProvisioningProfile(
-        appLookupParams,
-        testTarget,
-        IosDistributionType.AppStore
-      );
-      await setupProvisioningProfileAction.runAsync(ctx);
-
-      // expect build credentials to be created or updated on expo servers
-      expect(jest.mocked(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(
-        1
-      );
-      // expect provisioning profile not to be deleted on expo servers
-      expect(jest.mocked(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(0);
-    }
-  );
-
-  it('errors with --freeze-credentials flag', async () => {
+  it('repairs existing Provisioning Profile with bad build credentials in Interactive Mode', async () => {
    jest.mocked(validateProvisioningProfileAsync).mockImplementation(async () => false);
    const ctx = createCtxMock({
-      freezeCredentials: true,
+      nonInteractive: false,
+      appStore: {
+        ...getAppstoreMock(),
+        ensureAuthenticatedAsync: jest.fn(() => testAuthCtx),
+        authCtx: testAuthCtx,
+        listProvisioningProfilesAsync: jest.fn(() => [
+          {
+            provisioningProfileId: nullthrows(
+              testCommonIosAppCredentialsFragment.iosAppBuildCredentialsList[0].provisioningProfile
+            ).developerPortalIdentifier,
+          },
+        ]),
+      },
+      ios: {
+        ...getNewIosApiMock(),
+        getIosAppCredentialsWithBuildCredentialsAsync: jest.fn(
+          () => testCommonIosAppCredentialsFragment
+        ),
+        createOrGetExistingAppleAppIdentifierAsync: jest.fn(() => testAppleAppIdentifierFragment),
+        createOrUpdateIosAppBuildCredentialsAsync: jest.fn(
+          () => testIosAppBuildCredentialsFragment
+        ),
+      },
    });
    const appLookupParams = await getAppLookupParamsFromContextAsync(
      ctx,
@@ -225,9 +68,79 @@ describe('SetUpProvisioningProfile', () => {
      testTarget,
      IosDistributionType.AppStore
    );
-    await expect(setupProvisioningProfileAction.runAsync(ctx)).rejects.toThrowError(
-      ForbidCredentialModificationError
+    await setupProvisioningProfileAction.runAsync(ctx);
+
+    // expect build credentials to be created or updated on expo servers
+    expect(jest.mocked(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(
+      1
    );
+    // expect provisioning profile not to be deleted on expo servers
+    expect(jest.mocked(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(0);
+  });
+  it('sets up a new Provisioning Profile with bad build credentials in Interactive Mode', async () => {
+    jest.mocked(validateProvisioningProfileAsync).mockImplementation(async () => false);
+    const ctx = createCtxMock({
+      nonInteractive: false,
+      appStore: {
+        ...getAppstoreMock(),
+        ensureAuthenticatedAsync: jest.fn(() => testAuthCtx),
+        authCtx: testAuthCtx,
+        listProvisioningProfilesAsync: jest.fn(() => []),
+      },
+      ios: {
+        ...getNewIosApiMock(),
+        getIosAppCredentialsWithBuildCredentialsAsync: jest.fn(
+          () => testCommonIosAppCredentialsFragment
+        ),
+        createOrGetExistingAppleAppIdentifierAsync: jest.fn(() => testAppleAppIdentifierFragment),
+      },
+    });
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
+    const setupProvisioningProfileAction = new SetUpProvisioningProfile(
+      appLookupParams,
+      testTarget,
+      IosDistributionType.AppStore
+    );
+    await setupProvisioningProfileAction.runAsync(ctx);
+
+    // expect build credentials to be created or updated on expo servers
+    expect(jest.mocked(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(
+      1
+    );
+    // expect provisioning profile to be deleted on expo servers
+    expect(jest.mocked(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(1);
+  });
+  it('skips setting up a Provisioning Profile with prior build credentials configured properly in Interactive Mode', async () => {
+    jest.mocked(validateProvisioningProfileAsync).mockImplementation(async () => true);
+    const ctx = createCtxMock({
+      nonInteractive: false,
+      appStore: {
+        ...getAppstoreMock(),
+        ensureAuthenticatedAsync: jest.fn(() => testAuthCtx),
+        authCtx: testAuthCtx,
+        //listProvisioningProfilesAsync: jest.fn(() => []),
+      },
+      ios: {
+        ...getNewIosApiMock(),
+        getIosAppCredentialsWithBuildCredentialsAsync: jest.fn(
+          () => testCommonIosAppCredentialsFragment
+        ),
+        createOrGetExistingAppleAppIdentifierAsync: jest.fn(() => testAppleAppIdentifierFragment),
+      },
+    });
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
+    const setupProvisioningProfileAction = new SetUpProvisioningProfile(
+      appLookupParams,
+      testTarget,
+      IosDistributionType.AppStore
+    );
+    await setupProvisioningProfileAction.runAsync(ctx);

    // expect build credentials not to be created or updated on expo servers
    expect(jest.mocked(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(
@@ -236,8 +149,39 @@ describe('SetUpProvisioningProfile', () => {
    // expect provisioning profile not to be deleted on expo servers
    expect(jest.mocked(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(0);
  });
+  it('sets up a Provisioning Profile with no prior build credentials configured in Interactive Mode', async () => {
+    jest.mocked(validateProvisioningProfileAsync).mockImplementation(async () => false);
+    const ctx = createCtxMock({
+      nonInteractive: false,
+      appStore: {
+        ...getAppstoreMock(),
+        ensureAuthenticatedAsync: jest.fn(() => testAuthCtx),
+        authCtx: testAuthCtx,
+      },
+      ios: {
+        ...getNewIosApiMock(),
+        createOrGetExistingAppleAppIdentifierAsync: jest.fn(() => testAppleAppIdentifierFragment),
+      },
+    });
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
+    const setupProvisioningProfileAction = new SetUpProvisioningProfile(
+      appLookupParams,
+      testTarget,
+      IosDistributionType.AppStore
+    );
+    await setupProvisioningProfileAction.runAsync(ctx);

-  it('errors with wrong authentication type in nonInteractive mode', async () => {
+    // expect build credentials to be created or updated on expo servers
+    expect(jest.mocked(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(
+      1
+    );
+    // expect provisioning profile not to be deleted on expo servers
+    expect(jest.mocked(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(0);
+  });
+  it('errors in Non Interactive Mode', async () => {
    jest.mocked(validateProvisioningProfileAsync).mockImplementation(async () => false);
    const ctx = createCtxMock({
      nonInteractive: true,
@@ -252,7 +196,7 @@ describe('SetUpProvisioningProfile', () => {
      IosDistributionType.AppStore
    );
    await expect(setupProvisioningProfileAction.runAsync(ctx)).rejects.toThrowError(
-      InsufficientAuthenticationNonInteractiveError
+      MissingCredentialsNonInteractiveError
    );

    // expect build credentials not to be created or updated on expo servers
@@ -38,7 +38,6 @@ import {
  AppleDistributionCertificateFragment,
  ApplePushKeyFragment,
  AppleTeamFragment,
-  AppleTeamInput,
  CommonIosAppCredentialsFragment,
  IosAppBuildCredentialsFragment,
  IosDistributionType,
@@ -190,26 +189,28 @@ export async function updateIosAppCredentialsAsync(
  {
    applePushKeyId,
    ascApiKeyIdForSubmissions,
-    ascApiKeyIdForBuilds,
  }: {
    applePushKeyId?: string;
    ascApiKeyIdForSubmissions?: string;
-    ascApiKeyIdForBuilds?: string;
  }
 ): Promise<CommonIosAppCredentialsFragment> {
-  const updatedAppCredentials = appCredentials;
-  if (!applePushKeyId && !ascApiKeyIdForSubmissions && !ascApiKeyIdForBuilds) {
-    return updatedAppCredentials;
+  let updatedAppCredentials = appCredentials;
+  if (applePushKeyId) {
+    updatedAppCredentials = await IosAppCredentialsMutation.setPushKeyAsync(
+      graphqlClient,
+      updatedAppCredentials.id,
+      applePushKeyId
+    );
  }
-  return await IosAppCredentialsMutation.updateIosAppCredentialsAsync(
-    graphqlClient,
-    appCredentials.id,
-    {
-      pushKeyId: applePushKeyId,
-      appStoreConnectApiKeyForSubmissionsId: ascApiKeyIdForSubmissions,
-      appStoreConnectApiKeyForBuildsId: ascApiKeyIdForBuilds,
-    }
-  );
+  if (ascApiKeyIdForSubmissions) {
+    updatedAppCredentials =
+      await IosAppCredentialsMutation.setAppStoreConnectApiKeyForSubmissionsAsync(
+        graphqlClient,
+        updatedAppCredentials.id,
+        ascApiKeyIdForSubmissions
+      );
+  }
+  return updatedAppCredentials;
 }

 async function createOrGetExistingIosAppCredentialsWithBuildCredentialsAsync(
@@ -262,42 +263,7 @@ async function createOrGetExistingIosAppCredentialsWithBuildCredentialsAsync(
 export async function createOrGetExistingAppleTeamAsync(
  graphqlClient: ExpoGraphqlClient,
  account: AccountFragment,
-  { appleTeamIdentifier, appleTeamName, appleTeamType }: AppleTeamInput
-): Promise<AppleTeamFragment> {
-  return await createOrManageExistingAppleTeamAsync(
-    graphqlClient,
-    account,
-    {
-      appleTeamIdentifier,
-      appleTeamName,
-      appleTeamType,
-    },
-    { updateMissingFields: false }
-  );
-}
-
-export async function createOrUpdateExistingAppleTeamAsync(
-  graphqlClient: ExpoGraphqlClient,
-  account: AccountFragment,
-  { appleTeamIdentifier, appleTeamName, appleTeamType }: AppleTeamInput
-): Promise<AppleTeamFragment> {
-  return await createOrManageExistingAppleTeamAsync(
-    graphqlClient,
-    account,
-    {
-      appleTeamIdentifier,
-      appleTeamName,
-      appleTeamType,
-    },
-    { updateMissingFields: true }
-  );
-}
-
-async function createOrManageExistingAppleTeamAsync(
-  graphqlClient: ExpoGraphqlClient,
-  account: AccountFragment,
-  { appleTeamIdentifier, appleTeamName, appleTeamType }: AppleTeamInput,
-  { updateMissingFields }: { updateMissingFields: boolean }
+  { appleTeamIdentifier, appleTeamName }: { appleTeamIdentifier: string; appleTeamName?: string }
 ): Promise<AppleTeamFragment> {
  const appleTeam = await AppleTeamQuery.getByAppleTeamIdentifierAsync(
    graphqlClient,
@@ -305,24 +271,11 @@ async function createOrManageExistingAppleTeamAsync(
    appleTeamIdentifier
  );
  if (appleTeam) {
-    const didTeamNameChange = appleTeamName && appleTeam.appleTeamName !== appleTeamName;
-    const didTeamTypeChange = appleTeamType && appleTeam.appleTeamType !== appleTeamType;
-    const didFieldsChange = didTeamNameChange || didTeamTypeChange;
-    if (updateMissingFields && didFieldsChange) {
-      return await AppleTeamMutation.updateAppleTeamAsync(
-        graphqlClient,
-        {
-          appleTeamName: didTeamNameChange ? appleTeamName : undefined,
-          appleTeamType: didTeamTypeChange ? appleTeamType : undefined,
-        },
-        appleTeam.id
-      );
-    }
    return appleTeam;
  } else {
    return await AppleTeamMutation.createAppleTeamAsync(
      graphqlClient,
-      { appleTeamIdentifier, appleTeamName, appleTeamType },
+      { appleTeamIdentifier, appleTeamName },
      account.id
    );
  }
@@ -373,7 +326,7 @@ export async function getDevicesForAppleTeamAsync(
 ): Promise<AppleDeviceFragment[]> {
  return await AppleDeviceQuery.getAllByAppleTeamIdentifierAsync(
    graphqlClient,
-    account.name,
+    account.id,
    appleTeamIdentifier,
    {
      useCache,
@@ -568,20 +521,6 @@ export async function createAscApiKeyAsync(
  );
 }

-export async function updateAscApiKeyAsync(
-  graphqlClient: ExpoGraphqlClient,
-  ascApiKey: AppStoreConnectApiKeyFragment,
-  appleTeam: AppleTeamFragment
-): Promise<AppStoreConnectApiKeyFragment> {
-  return await AppStoreConnectApiKeyMutation.updateAppStoreConnectApiKeyAsync(
-    graphqlClient,
-    {
-      appleTeamId: appleTeam.id,
-    },
-    ascApiKey.id
-  );
-}
-
 export async function getAscApiKeysForAccountAsync(
  graphqlClient: ExpoGraphqlClient,
  account: AccountFragment
@@ -7,10 +7,8 @@ import { withErrorHandlingAsync } from '../../../../../graphql/client';
 import {
  AppStoreConnectApiKeyFragment,
  AppStoreConnectApiKeyInput,
-  AppStoreConnectApiKeyUpdateInput,
  CreateAppStoreConnectApiKeyMutation,
  DeleteAppStoreConnectApiKeyMutation,
-  UpdateAppStoreConnectApiKeyMutation,
 } from '../../../../../graphql/generated';
 import { AppStoreConnectApiKeyFragmentNode } from '../../../../../graphql/types/credentials/AppStoreConnectApiKey';

@@ -53,44 +51,6 @@ export const AppStoreConnectApiKeyMutation = {
    );
    return data.appStoreConnectApiKey.createAppStoreConnectApiKey;
  },
-  async updateAppStoreConnectApiKeyAsync(
-    graphqlClient: ExpoGraphqlClient,
-    appStoreConnectApiKeyUpdateInput: AppStoreConnectApiKeyUpdateInput,
-    appStoreConnectApiKeyId: string
-  ): Promise<AppStoreConnectApiKeyFragment> {
-    const data = await withErrorHandlingAsync(
-      graphqlClient
-        .mutation<UpdateAppStoreConnectApiKeyMutation>(
-          gql`
-            mutation UpdateAppStoreConnectApiKeyMutation(
-              $appStoreConnectApiKeyUpdateInput: AppStoreConnectApiKeyUpdateInput!
-              $id: ID!
-            ) {
-              appStoreConnectApiKey {
-                updateAppStoreConnectApiKey(
-                  appStoreConnectApiKeyUpdateInput: $appStoreConnectApiKeyUpdateInput
-                  id: $id
-                ) {
-                  id
-                  ...AppStoreConnectApiKeyFragment
-                }
-              }
-            }
-            ${print(AppStoreConnectApiKeyFragmentNode)}
-          `,
-          {
-            appStoreConnectApiKeyUpdateInput,
-            appStoreConnectApiKeyId,
-          }
-        )
-        .toPromise()
-    );
-    assert(
-      data.appStoreConnectApiKey.updateAppStoreConnectApiKey,
-      'GraphQL: `updateAppStoreConnectApiKey` not defined in server response'
-    );
-    return data.appStoreConnectApiKey.updateAppStoreConnectApiKey;
-  },
  async deleteAppStoreConnectApiKeyAsync(
    graphqlClient: ExpoGraphqlClient,
    appStoreConnectApiKeyId: string
@@ -7,9 +7,7 @@ import {
  AccountFragment,
  AppleTeamFragment,
  AppleTeamInput,
-  AppleTeamUpdateInput,
  CreateAppleTeamMutation,
-  UpdateAppleTeamMutation,
 } from '../../../../../graphql/generated';
 import { AccountFragmentNode } from '../../../../../graphql/types/Account';
 import { AppleTeamFragmentNode } from '../../../../../graphql/types/credentials/AppleTeam';
@@ -52,40 +50,4 @@ export const AppleTeamMutation = {
    );
    return data.appleTeam.createAppleTeam;
  },
-  async updateAppleTeamAsync(
-    graphqlClient: ExpoGraphqlClient,
-    appleTeamUpdateInput: AppleTeamUpdateInput,
-    appleTeamId: string
-  ): Promise<AppleTeamMutationResult> {
-    const data = await withErrorHandlingAsync(
-      graphqlClient
-        .mutation<UpdateAppleTeamMutation>(
-          gql`
-            mutation UpdateAppleTeamMutation(
-              $appleTeamUpdateInput: AppleTeamUpdateInput!
-              $appleTeamId: ID!
-            ) {
-              appleTeam {
-                updateAppleTeam(appleTeamUpdateInput: $appleTeamUpdateInput, id: $appleTeamId) {
-                  id
-                  ...AppleTeamFragment
-                  account {
-                    id
-                    ...AccountFragment
-                  }
-                }
-              }
-            }
-            ${print(AppleTeamFragmentNode)}
-            ${print(AccountFragmentNode)}
-          `,
-          {
-            appleTeamUpdateInput,
-            appleTeamId,
-          }
-        )
-        .toPromise()
-    );
-    return data.appleTeam.updateAppleTeam;
-  },
 };
@@ -10,7 +10,6 @@ import {
  IosAppCredentialsInput,
  SetAppStoreConnectApiKeyForSubmissionsMutation,
  SetPushKeyMutation,
-  UpdateIosAppCredentialsMutation,
 } from '../../../../../graphql/generated';
 import { CommonIosAppCredentialsFragmentNode } from '../../../../../graphql/types/credentials/IosAppCredentials';

@@ -57,44 +56,6 @@ export const IosAppCredentialsMutation = {
    );
    return data.iosAppCredentials.createIosAppCredentials;
  },
-  async updateIosAppCredentialsAsync(
-    graphqlClient: ExpoGraphqlClient,
-    iosAppCredentialsId: string,
-    iosAppCredentialsInput: IosAppCredentialsInput
-  ): Promise<CommonIosAppCredentialsFragment> {
-    const data = await withErrorHandlingAsync(
-      graphqlClient
-        .mutation<UpdateIosAppCredentialsMutation>(
-          gql`
-            mutation UpdateIosAppCredentialsMutation(
-              $iosAppCredentialsInput: IosAppCredentialsInput!
-              $iosAppCredentialsId: ID!
-            ) {
-              iosAppCredentials {
-                updateIosAppCredentials(
-                  id: $iosAppCredentialsId
-                  iosAppCredentialsInput: $iosAppCredentialsInput
-                ) {
-                  id
-                  ...CommonIosAppCredentialsFragment
-                }
-              }
-            }
-            ${print(CommonIosAppCredentialsFragmentNode)}
-          `,
-          {
-            iosAppCredentialsInput,
-            iosAppCredentialsId,
-          }
-        )
-        .toPromise()
-    );
-    assert(
-      data.iosAppCredentials.updateIosAppCredentials,
-      'GraphQL: `updateIosAppCredentials` not defined in server response'
-    );
-    return data.iosAppCredentials.updateIosAppCredentials;
-  },
  async setPushKeyAsync(
    graphqlClient: ExpoGraphqlClient,
    iosAppCredentialsId: string,
@@ -4,76 +4,27 @@ import gql from 'graphql-tag';
 import { ExpoGraphqlClient } from '../../../../../commandUtils/context/contextUtils/createGraphqlClient';
 import { withErrorHandlingAsync } from '../../../../../graphql/client';
 import {
+  AppStoreConnectApiKeyByAccountQuery,
  AppStoreConnectApiKeyFragment,
-  AppStoreConnectApiKeysPaginatedByAccountQuery,
 } from '../../../../../graphql/generated';
 import { AppStoreConnectApiKeyFragmentNode } from '../../../../../graphql/types/credentials/AppStoreConnectApiKey';
-import { Connection, QueryParams, fetchEntireDatasetAsync } from '../../../../../utils/relay';

 export const AppStoreConnectApiKeyQuery = {
  async getAllForAccountAsync(
    graphqlClient: ExpoGraphqlClient,
    accountName: string
  ): Promise<AppStoreConnectApiKeyFragment[]> {
-    const paginatedGetterAsync = async (
-      relayArgs: QueryParams
-    ): Promise<Connection<AppStoreConnectApiKeyFragment>> => {
-      return await AppStoreConnectApiKeyQuery.getAllForAccountPaginatedAsync(
-        graphqlClient,
-        accountName,
-        relayArgs
-      );
-    };
-    return await fetchEntireDatasetAsync({
-      paginatedGetterAsync,
-      progressBarLabel: 'fetching ASC Keys...',
-    });
-  },
-  async getAllForAccountPaginatedAsync(
-    graphqlClient: ExpoGraphqlClient,
-    accountName: string,
-    {
-      after,
-      first,
-      before,
-      last,
-    }: { after?: string; first?: number; before?: string; last?: number }
-  ): Promise<
-    AppStoreConnectApiKeysPaginatedByAccountQuery['account']['byName']['appStoreConnectApiKeysPaginated']
-  > {
    const data = await withErrorHandlingAsync(
      graphqlClient
-        .query<AppStoreConnectApiKeysPaginatedByAccountQuery>(
+        .query<AppStoreConnectApiKeyByAccountQuery>(
          gql`
-            query AppStoreConnectApiKeysPaginatedByAccountQuery(
-              $accountName: String!
-              $after: String
-              $first: Int
-              $before: String
-              $last: Int
-            ) {
+            query AppStoreConnectApiKeyByAccountQuery($accountName: String!) {
              account {
                byName(accountName: $accountName) {
                  id
-                  appStoreConnectApiKeysPaginated(
-                    after: $after
-                    first: $first
-                    before: $before
-                    last: $last
-                  ) {
-                    edges {
-                      cursor
-                      node {
-                        id
-                        ...AppStoreConnectApiKeyFragment
-                      }
-                    }
-                    pageInfo {
-                      hasNextPage
-                      hasPreviousPage
-                      startCursor
-                      endCursor
-                    }
+                  appStoreConnectApiKeys {
+                    id
+                    ...AppStoreConnectApiKeyFragment
                  }
                }
              }
@@ -82,10 +33,6 @@ export const AppStoreConnectApiKeyQuery = {
          `,
          {
            accountName,
-            after,
-            first,
-            before,
-            last,
          },
          {
            additionalTypenames: ['AppStoreConnectApiKey'],
@@ -93,6 +40,6 @@ export const AppStoreConnectApiKeyQuery = {
        )
        .toPromise()
    );
-    return data.account.byName.appStoreConnectApiKeysPaginated;
+    return data.account.byName.appStoreConnectApiKeys;
  },
 };
@@ -1,3 +1,4 @@
+import assert from 'assert';
 import { print } from 'graphql';
 import gql from 'graphql-tag';

@@ -6,16 +7,15 @@ import { DeviceNotFoundError } from '../../../../../devices/utils/errors';
 import { withErrorHandlingAsync } from '../../../../../graphql/client';
 import {
  AppleDevice,
-  AppleDeviceFilterInput,
  AppleDeviceFragment,
+  AppleDevicesByAppleTeamQuery,
+  AppleDevicesByIdentifierQuery,
  AppleDevicesByTeamIdentifierQuery,
  AppleDevicesByTeamIdentifierQueryVariables,
-  AppleDevicesPaginatedByAccountQuery,
  AppleTeamFragment,
 } from '../../../../../graphql/generated';
 import { AppleDeviceFragmentNode } from '../../../../../graphql/types/credentials/AppleDevice';
 import { AppleTeamFragmentNode } from '../../../../../graphql/types/credentials/AppleTeam';
-import { Connection, QueryParams, fetchEntireDatasetAsync } from '../../../../../utils/relay';
 import { formatAppleTeam } from '../../../actions/AppleTeamFormatting';

 export type AppleDeviceFragmentWithAppleTeam = AppleDeviceFragment & {
@@ -38,25 +38,51 @@ export type AppleDevicesByIdentifierQueryResult = AppleDeviceQueryResult & {
 export const AppleDeviceQuery = {
  async getAllByAppleTeamIdentifierAsync(
    graphqlClient: ExpoGraphqlClient,
-    accountName: string,
+    accountId: string,
    appleTeamIdentifier: string,
    { useCache = true }: { useCache?: boolean } = {}
  ): Promise<AppleDeviceFragmentWithAppleTeam[]> {
-    const paginatedGetterAsync = async (
-      relayArgs: QueryParams
-    ): Promise<Connection<AppleDeviceFragmentWithAppleTeam>> => {
-      return await AppleDeviceQuery.getAllForAccountPaginatedAsync(graphqlClient, accountName, {
-        ...relayArgs,
-        filter: {
-          appleTeamIdentifier,
-        },
-        useCache,
-      });
-    };
-    return await fetchEntireDatasetAsync({
-      paginatedGetterAsync,
-      progressBarLabel: 'Fetching Apple devices...',
-    });
+    const data = await withErrorHandlingAsync(
+      graphqlClient
+        .query<AppleDevicesByAppleTeamQuery>(
+          gql`
+            query AppleDevicesByAppleTeamQuery($accountId: ID!, $appleTeamIdentifier: String!) {
+              appleTeam {
+                byAppleTeamIdentifier(accountId: $accountId, identifier: $appleTeamIdentifier) {
+                  id
+                  ...AppleTeamFragment
+                  appleDevices {
+                    id
+                    ...AppleDeviceFragment
+                    appleTeam {
+                      id
+                      ...AppleTeamFragment
+                    }
+                  }
+                }
+              }
+            }
+            ${print(AppleTeamFragmentNode)}
+            ${print(AppleDeviceFragmentNode)}
+          `,
+          {
+            accountId,
+            appleTeamIdentifier,
+          },
+          {
+            additionalTypenames: ['AppleDevice'],
+            requestPolicy: useCache ? 'cache-first' : 'network-only',
+          }
+        )
+        .toPromise()
+    );
+    assert(
+      data.appleTeam.byAppleTeamIdentifier,
+      'byAppleTeamIdentifier should be defined in this context - enforced by GraphQL'
+    );
+    const { appleDevices } = data.appleTeam.byAppleTeamIdentifier;
+    assert(appleDevices, 'Apple Devices should be defined in this context - enforced by GraphQL');
+    return appleDevices;
  },

  async getAllForAppleTeamAsync(
@@ -87,7 +113,6 @@ export const AppleDeviceQuery = {
                      deviceClass
                      enabled
                      model
-                      createdAt
                    }
                  }
                }
@@ -113,21 +138,41 @@ export const AppleDeviceQuery = {
    graphqlClient: ExpoGraphqlClient,
    accountName: string,
    identifier: string
-  ): Promise<AppleDeviceFragmentWithAppleTeam> {
-    const paginatedGetterAsync = async (
-      relayArgs: QueryParams
-    ): Promise<Connection<AppleDeviceFragmentWithAppleTeam>> => {
-      return await AppleDeviceQuery.getAllForAccountPaginatedAsync(graphqlClient, accountName, {
-        ...relayArgs,
-        filter: {
-          identifier,
-        },
-      });
-    };
-    const devices = await fetchEntireDatasetAsync({
-      paginatedGetterAsync,
-    });
-    const device = devices[0];
+  ): Promise<AppleDevicesByIdentifierQueryResult> {
+    const data = await withErrorHandlingAsync(
+      graphqlClient
+        .query<AppleDevicesByIdentifierQuery>(
+          gql`
+            query AppleDevicesByIdentifier($accountName: String!, $identifier: String!) {
+              account {
+                byName(accountName: $accountName) {
+                  id
+                  appleDevices(identifier: $identifier) {
+                    id
+                    model
+                    identifier
+                    name
+                    deviceClass
+                    enabled
+                    appleTeam {
+                      id
+                      appleTeamIdentifier
+                      appleTeamName
+                    }
+                  }
+                }
+              }
+            }
+          `,
+          { accountName, identifier },
+          {
+            additionalTypenames: ['AppleDevice', 'AppleTeam'],
+          }
+        )
+        .toPromise()
+    );
+
+    const device = data.account.byName.appleDevices[0];
    if (!device) {
      throw new DeviceNotFoundError(
        `Device with id ${identifier} was not found on account ${accountName}.`
@@ -135,86 +180,4 @@ export const AppleDeviceQuery = {
    }
    return device;
  },
-  async getAllForAccountPaginatedAsync(
-    graphqlClient: ExpoGraphqlClient,
-    accountName: string,
-    {
-      after,
-      first,
-      before,
-      last,
-      filter,
-      useCache = true,
-    }: {
-      after?: string;
-      first?: number;
-      before?: string;
-      last?: number;
-      filter?: AppleDeviceFilterInput;
-      useCache?: boolean;
-    }
-  ): Promise<AppleDevicesPaginatedByAccountQuery['account']['byName']['appleDevicesPaginated']> {
-    const data = await withErrorHandlingAsync(
-      graphqlClient
-        .query<AppleDevicesPaginatedByAccountQuery>(
-          gql`
-            query AppleDevicesPaginatedByAccountQuery(
-              $accountName: String!
-              $after: String
-              $first: Int
-              $before: String
-              $last: Int
-              $filter: AppleDeviceFilterInput
-            ) {
-              account {
-                byName(accountName: $accountName) {
-                  id
-                  appleDevicesPaginated(
-                    after: $after
-                    first: $first
-                    before: $before
-                    last: $last
-                    filter: $filter
-                  ) {
-                    edges {
-                      cursor
-                      node {
-                        id
-                        ...AppleDeviceFragment
-                        appleTeam {
-                          id
-                          ...AppleTeamFragment
-                        }
-                      }
-                    }
-                    pageInfo {
-                      hasNextPage
-                      hasPreviousPage
-                      startCursor
-                      endCursor
-                    }
-                  }
-                }
-              }
-            }
-            ${print(AppleTeamFragmentNode)}
-            ${print(AppleDeviceFragmentNode)}
-          `,
-          {
-            accountName,
-            after,
-            first,
-            before,
-            last,
-            filter,
-          },
-          {
-            additionalTypenames: ['AppleDevice'],
-            requestPolicy: useCache ? 'cache-first' : 'network-only',
-          }
-        )
-        .toPromise()
-    );
-    return data.account.byName.appleDevicesPaginated;
-  },
 };
@@ -5,14 +5,13 @@ import gql from 'graphql-tag';
 import { ExpoGraphqlClient } from '../../../../../commandUtils/context/contextUtils/createGraphqlClient';
 import { withErrorHandlingAsync } from '../../../../../graphql/client';
 import {
+  AppleDistributionCertificateByAccountQuery,
  AppleDistributionCertificateByAppQuery,
  AppleDistributionCertificateFragment,
-  AppleDistributionCertificatesPaginatedByAccountQuery,
  IosDistributionType,
 } from '../../../../../graphql/generated';
 import { AppleDistributionCertificateFragmentNode } from '../../../../../graphql/types/credentials/AppleDistributionCertificate';
 import { AppleTeamFragmentNode } from '../../../../../graphql/types/credentials/AppleTeam';
-import { Connection, QueryParams, fetchEntireDatasetAsync } from '../../../../../utils/relay';

 export const AppleDistributionCertificateQuery = {
  async getForAppAsync(
@@ -82,65 +81,17 @@ export const AppleDistributionCertificateQuery = {
    graphqlClient: ExpoGraphqlClient,
    accountName: string
  ): Promise<AppleDistributionCertificateFragment[]> {
-    const paginatedGetterAsync = async (
-      relayArgs: QueryParams
-    ): Promise<Connection<AppleDistributionCertificateFragment>> => {
-      return await AppleDistributionCertificateQuery.getAllForAccountPaginatedAsync(
-        graphqlClient,
-        accountName,
-        relayArgs
-      );
-    };
-    return await fetchEntireDatasetAsync({
-      paginatedGetterAsync,
-      progressBarLabel: 'fetching Apple Distribution Certificates...',
-    });
-  },
-  async getAllForAccountPaginatedAsync(
-    graphqlClient: ExpoGraphqlClient,
-    accountName: string,
-    {
-      after,
-      first,
-      before,
-      last,
-    }: { after?: string; first?: number; before?: string; last?: number }
-  ): Promise<
-    AppleDistributionCertificatesPaginatedByAccountQuery['account']['byName']['appleDistributionCertificatesPaginated']
-  > {
    const data = await withErrorHandlingAsync(
      graphqlClient
-        .query<AppleDistributionCertificatesPaginatedByAccountQuery>(
+        .query<AppleDistributionCertificateByAccountQuery>(
          gql`
-            query AppleDistributionCertificatesPaginatedByAccountQuery(
-              $accountName: String!
-              $after: String
-              $first: Int
-              $before: String
-              $last: Int
-            ) {
+            query AppleDistributionCertificateByAccountQuery($accountName: String!) {
              account {
                byName(accountName: $accountName) {
                  id
-                  appleDistributionCertificatesPaginated(
-                    after: $after
-                    first: $first
-                    before: $before
-                    last: $last
-                  ) {
-                    edges {
-                      cursor
-                      node {
-                        id
-                        ...AppleDistributionCertificateFragment
-                      }
-                    }
-                    pageInfo {
-                      hasNextPage
-                      hasPreviousPage
-                      startCursor
-                      endCursor
-                    }
+                  appleDistributionCertificates {
+                    id
+                    ...AppleDistributionCertificateFragment
                  }
                }
              }
@@ -149,10 +100,6 @@ export const AppleDistributionCertificateQuery = {
          `,
          {
            accountName,
-            after,
-            first,
-            before,
-            last,
          },
          {
            additionalTypenames: ['AppleDistributionCertificate'],
@@ -160,6 +107,6 @@ export const AppleDistributionCertificateQuery = {
        )
        .toPromise()
    );
-    return data.account.byName.appleDistributionCertificatesPaginated;
+    return data.account.byName.appleDistributionCertificates;
  },
 };
@@ -3,75 +3,25 @@ import gql from 'graphql-tag';

 import { ExpoGraphqlClient } from '../../../../../commandUtils/context/contextUtils/createGraphqlClient';
 import { withErrorHandlingAsync } from '../../../../../graphql/client';
-import {
-  ApplePushKeyFragment,
-  ApplePushKeysPaginatedByAccountQuery,
-} from '../../../../../graphql/generated';
+import { ApplePushKeyByAccountQuery, ApplePushKeyFragment } from '../../../../../graphql/generated';
 import { ApplePushKeyFragmentNode } from '../../../../../graphql/types/credentials/ApplePushKey';
-import { Connection, QueryParams, fetchEntireDatasetAsync } from '../../../../../utils/relay';

 export const ApplePushKeyQuery = {
  async getAllForAccountAsync(
    graphqlClient: ExpoGraphqlClient,
    accountName: string
  ): Promise<ApplePushKeyFragment[]> {
-    const paginatedGetterAsync = async (
-      relayArgs: QueryParams
-    ): Promise<Connection<ApplePushKeyFragment>> => {
-      return await ApplePushKeyQuery.getAllForAccountPaginatedAsync(
-        graphqlClient,
-        accountName,
-        relayArgs
-      );
-    };
-    return await fetchEntireDatasetAsync({
-      paginatedGetterAsync,
-      progressBarLabel: 'fetching Apple Push Keys...',
-    });
-  },
-  async getAllForAccountPaginatedAsync(
-    graphqlClient: ExpoGraphqlClient,
-    accountName: string,
-    {
-      after,
-      first,
-      before,
-      last,
-    }: { after?: string; first?: number; before?: string; last?: number }
-  ): Promise<ApplePushKeysPaginatedByAccountQuery['account']['byName']['applePushKeysPaginated']> {
    const data = await withErrorHandlingAsync(
      graphqlClient
-        .query<ApplePushKeysPaginatedByAccountQuery>(
+        .query<ApplePushKeyByAccountQuery>(
          gql`
-            query ApplePushKeysPaginatedByAccountQuery(
-              $accountName: String!
-              $after: String
-              $first: Int
-              $before: String
-              $last: Int
-            ) {
+            query ApplePushKeyByAccountQuery($accountName: String!) {
              account {
                byName(accountName: $accountName) {
                  id
-                  applePushKeysPaginated(
-                    after: $after
-                    first: $first
-                    before: $before
-                    last: $last
-                  ) {
-                    edges {
-                      cursor
-                      node {
-                        id
-                        ...ApplePushKeyFragment
-                      }
-                    }
-                    pageInfo {
-                      hasNextPage
-                      hasPreviousPage
-                      startCursor
-                      endCursor
-                    }
+                  applePushKeys {
+                    id
+                    ...ApplePushKeyFragment
                  }
                }
              }
@@ -80,10 +30,6 @@ export const ApplePushKeyQuery = {
          `,
          {
            accountName,
-            after,
-            first,
-            before,
-            last,
          },
          {
            additionalTypenames: ['ApplePushKey'],
@@ -91,6 +37,6 @@ export const ApplePushKeyQuery = {
        )
        .toPromise()
    );
-    return data.account.byName.applePushKeysPaginated;
+    return data.account.byName.applePushKeys;
  },
 };
@@ -1,4 +1,4 @@
-import { ProfileType, UserRole } from '@expo/app-store';
+import { ProfileType } from '@expo/app-store';

 import {
  AscApiKey,
@@ -45,23 +45,16 @@ import { createOrReuseAdhocProvisioningProfileAsync } from './provisioningProfil
 import { createPushKeyAsync, listPushKeysAsync, revokePushKeyAsync } from './pushKey';
 import { hasAscEnvVars } from './resolveCredentials';
 import { Analytics } from '../../../analytics/AnalyticsManager';
-import { AppleTeamType } from '../../../graphql/generated';
 import Log from '../../../log';
-import { MinimalAscApiKey } from '../credentials';

-export type AscApiKeyAuth = {
-  ascApiKey: MinimalAscApiKey;
-  appleTeam: { teamIdentifier: string; teamName?: string; teamType: AppleTeamType };
-};
 export default class AppStoreApi {
  public authCtx?: AuthCtx;
  public defaultAuthenticationMode: AuthenticationMode;
-  public readonly ascApiKeyAuth?: AscApiKeyAuth;

-  constructor(options: { ascApiKeyAuth?: AscApiKeyAuth } = {}) {
-    this.ascApiKeyAuth = options.ascApiKeyAuth;
-    this.defaultAuthenticationMode =
-      hasAscEnvVars() || this.ascApiKeyAuth ? AuthenticationMode.API_KEY : AuthenticationMode.USER;
+  constructor() {
+    this.defaultAuthenticationMode = hasAscEnvVars()
+      ? AuthenticationMode.API_KEY
+      : AuthenticationMode.USER;
  }

  public async ensureUserAuthenticatedAsync(options?: AuthenticateOptions): Promise<UserAuthCtx> {
@@ -202,10 +195,10 @@ export default class AppStoreApi {

  public async createAscApiKeyAsync(
    analytics: Analytics,
-    { nickname, roles }: { nickname: string; roles: UserRole[] }
+    { nickname }: { nickname: string }
  ): Promise<AscApiKey> {
    const userCtx = await this.ensureUserAuthenticatedAsync();
-    return await createAscApiKeyAsync(analytics, userCtx, { nickname, roles });
+    return await createAscApiKeyAsync(analytics, userCtx, { nickname });
  }

  public async revokeAscApiKeyAsync(keyId: string): Promise<AscApiKeyInfo> {
@@ -9,7 +9,6 @@ export enum AuthenticationMode {
  USER,
 }

-// TODO: move this to graphql types
 export enum AppleTeamType {
  IN_HOUSE = 'IN_HOUSE',
  COMPANY_OR_ORGANIZATION = 'COMPANY_OR_ORGANIZATION',
@@ -1,54 +1,54 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

 exports[`print credentials prints the IosAppCredentials map 1`] = `
-"iOS Credentials                       
-Project                               @quinlanj/test52
-Bundle Identifier                     com.quinlanj.test52
-Apple Team                            test-apple-identifier 
-                                      
-Push Key                              
-Developer Portal ID                   9839M6AY8W
-Apple Team                            77KQ969CHE 
-Updated                               6 months ago
-                                      
-EAS Submit App Store Connect API Key  
-Developer Portal ID                   NYN468XNN3
-Name                                  Expo Submissions pl94k8_lnS
-Issuer ID                             69a6de93-e4e4-47e3-e053-5b8c7c11a4d1
-Roles                                 ADMIN
-Apple Team                            77KQ969CHE 
-Updated                               6 months ago
-                                      
-                                      
-App Store Configuration               
-                                      
-Distribution Certificate              
-Serial Number                         test-serial
-Expiration Date                       Wed, 13 Oct 2021 18:28:44 UTC
-Apple Team                            test-apple-identifier 
-Updated                               6 months ago
-                                      
-Provisioning Profile                  
-Developer Portal ID                   test-profile-id
-Status                                active
-Expiration                            Wed, 13 Oct 2021 18:28:44 UTC
-Apple Team                            test-apple-identifier 
-Updated                               5 months ago
-                                      
-                                      
-Ad Hoc Configuration                  
-                                      
-Distribution Certificate              
-Serial Number                         test-serial
-Expiration Date                       Wed, 13 Oct 2021 18:28:44 UTC
-Apple Team                            test-apple-identifier 
-Updated                               6 months ago
-                                      
-Provisioning Profile                  
-Developer Portal ID                   test-profile-id
-Status                                active
-Expiration                            Wed, 13 Oct 2021 18:28:44 UTC
-Apple Team                            test-apple-identifier 
-Updated                               5 months ago
-                                      "
+"iOS Credentials            
+Project                    @quinlanj/test52
+Bundle Identifier          com.quinlanj.test52
+Apple Team                 test-apple-identifier 
+                           
+Push Key                   
+Developer Portal ID        9839M6AY8W
+Apple Team                 77KQ969CHE 
+Updated                    6 months ago
+                           
+App Store Connect API Key  
+Developer Portal ID        NYN468XNN3
+Name                       Expo Submissions pl94k8_lnS
+Issuer ID                  69a6de93-e4e4-47e3-e053-5b8c7c11a4d1
+Roles                      ADMIN
+Apple Team                 77KQ969CHE 
+Updated                    6 months ago
+                           
+                           
+App Store Configuration    
+                           
+Distribution Certificate   
+Serial Number              test-serial
+Expiration Date            Wed, 13 Oct 2021 18:28:44 UTC
+Apple Team                 test-apple-identifier 
+Updated                    6 months ago
+                           
+Provisioning Profile       
+Developer Portal ID        test-profile-id
+Status                     active
+Expiration                 Wed, 13 Oct 2021 18:28:44 UTC
+Apple Team                 test-apple-identifier 
+Updated                    5 months ago
+                           
+                           
+Ad Hoc Configuration       
+                           
+Distribution Certificate   
+Serial Number              test-serial
+Expiration Date            Wed, 13 Oct 2021 18:28:44 UTC
+Apple Team                 test-apple-identifier 
+Updated                    6 months ago
+                           
+Provisioning Profile       
+Developer Portal ID        test-profile-id
+Status                     active
+Expiration                 Wed, 13 Oct 2021 18:28:44 UTC
+Apple Team                 test-apple-identifier 
+Updated                    5 months ago
+                           "
 `;