@expo/build-tools 1.0.107 → 1.0.108

package/dist/common/projectSources.js

@@ -7,7 +7,6 @@ exports.downloadAndUnpackProjectFromTarGzAsync = exports.prepareProjectSourcesAs
 const path_1 = __importDefault(require("path"));
 const turtle_spawn_1 = __importDefault(require("@expo/turtle-spawn"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const nullthrows_1 = __importDefault(require("nullthrows"));
 const eas_build_job_1 = require("@expo/eas-build-job");
 const downloader_1 = __importDefault(require("@expo/downloader"));
 async function prepareProjectSourcesAsync(ctx, destinationDirectory = ctx.buildDirectory) {
@@ -30,24 +29,11 @@ async function prepareProjectSourcesAsync(ctx, destinationDirectory = ctx.buildD
 }
 exports.prepareProjectSourcesAsync = prepareProjectSourcesAsync;
 async function shallowCloneRepositoryAsync({ logger, archiveSource, destinationDirectory, }) {
-    var _a;
     const { repositoryUrl } = archiveSource;
     try {
         await (0, turtle_spawn_1.default)('git', ['init'], { cwd: destinationDirectory });
         await (0, turtle_spawn_1.default)('git', ['remote', 'add', 'origin', repositoryUrl], { cwd: destinationDirectory });
-        let gitRef;
-        let gitCommitHash;
-        // If gitRef is provided, but gitCommitHash is not,
-        // we're handling a legacy case - gitRef is the commit hash.
-        // Otherwise we expect gitCommitHash to be present.
-        if (archiveSource.gitRef && !archiveSource.gitCommitHash) {
-            gitCommitHash = archiveSource.gitRef;
-            gitRef = null;
-        }
-        else {
-            gitCommitHash = (0, nullthrows_1.default)(archiveSource.gitCommitHash);
-            gitRef = (_a = archiveSource.gitRef) !== null && _a !== void 0 ? _a : null;
-        }
+        const { gitRef, gitCommitHash } = archiveSource;
         await (0, turtle_spawn_1.default)('git', ['fetch', 'origin', '--depth', '1', '--no-tags', gitCommitHash], {
             cwd: destinationDirectory,
         });

package/dist/common/projectSources.js.map

@@ -1 +1 @@
-{"version":3,"file":"projectSources.js","sourceRoot":"","sources":["../../src/common/projectSources.ts"],"names":[],"mappings":"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","sourcesContent":["import path from 'path';\n\nimport spawn from '@expo/turtle-spawn';\nimport fs from 'fs-extra';\nimport nullthrows from 'nullthrows';\nimport { ArchiveSource, ArchiveSourceType, Job } from '@expo/eas-build-job';\nimport { bunyan } from '@expo/logger';\nimport downloadFile from '@expo/downloader';\n\nimport { BuildContext } from '../context';\n\nexport async function prepareProjectSourcesAsync<TJob extends Job>(\n  ctx: BuildContext<TJob>,\n  destinationDirectory = ctx.buildDirectory\n): Promise<void> {\n  if (ctx.job.projectArchive.type === ArchiveSourceType.GCS) {\n    throw new Error('GCS project sources should be resolved earlier to url');\n  } else if (ctx.job.projectArchive.type === ArchiveSourceType.PATH) {\n    await prepareProjectSourcesLocallyAsync(ctx, ctx.job.projectArchive.path, destinationDirectory); // used in eas build --local\n  } else if (ctx.job.projectArchive.type === ArchiveSourceType.URL) {\n    await downloadAndUnpackProjectFromTarGzAsync(\n      ctx,\n      ctx.job.projectArchive.url,\n      destinationDirectory\n    );\n  } else if (ctx.job.projectArchive.type === ArchiveSourceType.GIT) {\n    await shallowCloneRepositoryAsync({\n      logger: ctx.logger,\n      archiveSource: ctx.job.projectArchive,\n      destinationDirectory,\n    });\n  }\n}\n\nasync function shallowCloneRepositoryAsync({\n  logger,\n  archiveSource,\n  destinationDirectory,\n}: {\n  logger: bunyan;\n  archiveSource: ArchiveSource & { type: ArchiveSourceType.GIT };\n  destinationDirectory: string;\n}): Promise<void> {\n  const { repositoryUrl } = archiveSource;\n  try {\n    await spawn('git', ['init'], { cwd: destinationDirectory });\n    await spawn('git', ['remote', 'add', 'origin', repositoryUrl], { cwd: destinationDirectory });\n\n    let gitRef: string | null;\n    let gitCommitHash: string;\n    // If gitRef is provided, but gitCommitHash is not,\n    // we're handling a legacy case - gitRef is the commit hash.\n    // Otherwise we expect gitCommitHash to be present.\n    if (archiveSource.gitRef && !archiveSource.gitCommitHash) {\n      gitCommitHash = archiveSource.gitRef;\n      gitRef = null;\n    } else {\n      gitCommitHash = nullthrows(archiveSource.gitCommitHash);\n      gitRef = archiveSource.gitRef ?? null;\n    }\n\n    await spawn('git', ['fetch', 'origin', '--depth', '1', '--no-tags', gitCommitHash], {\n      cwd: destinationDirectory,\n    });\n\n    await spawn('git', ['checkout', gitCommitHash], { cwd: destinationDirectory });\n\n    // If we have a gitRef, we try to add it to the repo.\n    if (gitRef) {\n      const { name, type } = getStrippedBranchOrTagName(gitRef);\n      switch (type) {\n        // If the gitRef is for a tag, we add a lightweight tag to current commit.\n        case 'tag': {\n          await spawn('git', ['tag', name], { cwd: destinationDirectory });\n          break;\n        }\n        // gitRef for a branch may come as:\n        // - qualified ref (e.g. refs/heads/feature/add-icon), detected as \"branch\" for a push,\n        // - unqualified ref (e.g. feature/add-icon), detected as \"other\" for a pull request.\n        case 'branch':\n        case 'other': {\n          await spawn('git', ['checkout', '-b', name], { cwd: destinationDirectory });\n          break;\n        }\n      }\n    }\n  } catch (err: any) {\n    const sanitizedUrl = getSanitizedGitUrl(repositoryUrl);\n    if (sanitizedUrl) {\n      logger.error(`Failed to clone git repository: ${sanitizedUrl}.`);\n    } else {\n      logger.error('Failed to clone git repository.');\n    }\n    logger.error(err.stderr);\n    throw err;\n  }\n}\n\nfunction getSanitizedGitUrl(maybeGitUrl: string): string | null {\n  try {\n    const url = new URL(maybeGitUrl);\n    if (url.password) {\n      url.password = '*******';\n    }\n    return url.toString();\n  } catch {\n    return null;\n  }\n}\n\nexport async function downloadAndUnpackProjectFromTarGzAsync<TJob extends Job>(\n  ctx: BuildContext<TJob>,\n  projectArchiveUrl: string,\n  destinationDirectory: string\n): Promise<void> {\n  const projectTarball = path.join(ctx.workingdir, 'project.tar.gz');\n  try {\n    await downloadFile(projectArchiveUrl, projectTarball, { retry: 3 });\n  } catch (err: any) {\n    ctx.reportError?.('Failed to download project archive', err, {\n      extras: { buildId: ctx.env.EAS_BUILD_ID },\n    });\n    throw err;\n  }\n\n  await unpackTarGzAsync({\n    destination: destinationDirectory,\n    source: projectTarball,\n    logger: ctx.logger,\n  });\n}\n\nasync function prepareProjectSourcesLocallyAsync<TJob extends Job>(\n  ctx: BuildContext<TJob>,\n  projectArchivePath: string,\n  destinationDirectory: string\n): Promise<void> {\n  const projectTarball = path.join(ctx.workingdir, 'project.tar.gz');\n  await fs.copy(projectArchivePath, projectTarball);\n\n  await unpackTarGzAsync({\n    destination: destinationDirectory,\n    source: projectTarball,\n    logger: ctx.logger,\n  });\n}\n\nasync function unpackTarGzAsync({\n  logger,\n  source,\n  destination,\n}: {\n  logger: bunyan;\n  source: string;\n  destination: string;\n}): Promise<void> {\n  await spawn('tar', ['-C', destination, '--strip-components', '1', '-zxf', source], {\n    logger,\n  });\n}\n\nfunction getStrippedBranchOrTagName(ref: string): {\n  name: string;\n  type: 'branch' | 'tag' | 'other';\n} {\n  const branchRegex = /(\\/?refs)?\\/?heads\\/(.+)/;\n  const branchMatch = ref.match(branchRegex);\n\n  if (branchMatch) {\n    return {\n      name: branchMatch[2],\n      type: 'branch',\n    };\n  }\n\n  const tagRegex = /(\\/?refs)?\\/?tags\\/(.+)/;\n  const tagMatch = ref.match(tagRegex);\n\n  if (tagMatch) {\n    return {\n      name: tagMatch[2],\n      type: 'tag',\n    };\n  }\n\n  return {\n    name: ref,\n    type: 'other',\n  };\n}\n"]}
+{"version":3,"file":"projectSources.js","sourceRoot":"","sources":["../../src/common/projectSources.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,sEAAuC;AACvC,wDAA0B;AAC1B,uDAA4E;AAE5E,kEAA4C;AAIrC,KAAK,UAAU,0BAA0B,CAC9C,GAAuB,EACvB,oBAAoB,GAAG,GAAG,CAAC,cAAc;IAEzC,IAAI,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,KAAK,iCAAiB,CAAC,GAAG,EAAE,CAAC;QAC1D,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;IAC3E,CAAC;SAAM,IAAI,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,KAAK,iCAAiB,CAAC,IAAI,EAAE,CAAC;QAClE,MAAM,iCAAiC,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC,CAAC,4BAA4B;IAC/H,CAAC;SAAM,IAAI,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,KAAK,iCAAiB,CAAC,GAAG,EAAE,CAAC;QACjE,MAAM,sCAAsC,CAC1C,GAAG,EACH,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,GAAG,EAC1B,oBAAoB,CACrB,CAAC;IACJ,CAAC;SAAM,IAAI,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,KAAK,iCAAiB,CAAC,GAAG,EAAE,CAAC;QACjE,MAAM,2BAA2B,CAAC;YAChC,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,aAAa,EAAE,GAAG,CAAC,GAAG,CAAC,cAAc;YACrC,oBAAoB;SACrB,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AArBD,gEAqBC;AAED,KAAK,UAAU,2BAA2B,CAAC,EACzC,MAAM,EACN,aAAa,EACb,oBAAoB,GAKrB;IACC,MAAM,EAAE,aAAa,EAAE,GAAG,aAAa,CAAC;IACxC,IAAI,CAAC;QACH,MAAM,IAAA,sBAAK,EAAC,KAAK,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,oBAAoB,EAAE,CAAC,CAAC;QAC5D,MAAM,IAAA,sBAAK,EAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,CAAC,EAAE,EAAE,GAAG,EAAE,oBAAoB,EAAE,CAAC,CAAC;QAE9F,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,aAAa,CAAC;QAEhD,MAAM,IAAA,sBAAK,EAAC,KAAK,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,EAAE,WAAW,EAAE,aAAa,CAAC,EAAE;YAClF,GAAG,EAAE,oBAAoB;SAC1B,CAAC,CAAC;QAEH,MAAM,IAAA,sBAAK,EAAC,KAAK,EAAE,CAAC,UAAU,EAAE,aAAa,CAAC,EAAE,EAAE,GAAG,EAAE,oBAAoB,EAAE,CAAC,CAAC;QAE/E,qDAAqD;QACrD,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,0BAA0B,CAAC,MAAM,CAAC,CAAC;YAC1D,QAAQ,IAAI,EAAE,CAAC;gBACb,0EAA0E;gBAC1E,KAAK,KAAK,CAAC,CAAC,CAAC;oBACX,MAAM,IAAA,sBAAK,EAAC,KAAK,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,oBAAoB,EAAE,CAAC,CAAC;oBACjE,MAAM;gBACR,CAAC;gBACD,mCAAmC;gBACnC,uFAAuF;gBACvF,qFAAqF;gBACrF,KAAK,QAAQ,CAAC;gBACd,KAAK,OAAO,CAAC,CAAC,CAAC;oBACb,MAAM,IAAA,sBAAK,EAAC,KAAK,EAAE,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,oBAAoB,EAAE,CAAC,CAAC;oBAC5E,MAAM;gBACR,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,MAAM,YAAY,GAAG,kBAAkB,CAAC,aAAa,CAAC,CAAC;QACvD,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,CAAC,KAAK,CAAC,mCAAmC,YAAY,GAAG,CAAC,CAAC;QACnE,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;QAClD,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACzB,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,WAAmB;IAC7C,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;QACjC,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;YACjB,GAAG,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC3B,CAAC;QACD,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;IACxB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,sCAAsC,CAC1D,GAAuB,EACvB,iBAAyB,EACzB,oBAA4B;;IAE5B,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IACnE,IAAI,CAAC;QACH,MAAM,IAAA,oBAAY,EAAC,iBAAiB,EAAE,cAAc,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;IACtE,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,MAAA,GAAG,CAAC,WAAW,oDAAG,oCAAoC,EAAE,GAAG,EAAE;YAC3D,MAAM,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE;SAC1C,CAAC,CAAC;QACH,MAAM,GAAG,CAAC;IACZ,CAAC;IAED,MAAM,gBAAgB,CAAC;QACrB,WAAW,EAAE,oBAAoB;QACjC,MAAM,EAAE,cAAc;QACtB,MAAM,EAAE,GAAG,CAAC,MAAM;KACnB,CAAC,CAAC;AACL,CAAC;AApBD,wFAoBC;AAED,KAAK,UAAU,iCAAiC,CAC9C,GAAuB,EACvB,kBAA0B,EAC1B,oBAA4B;IAE5B,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IACnE,MAAM,kBAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;IAElD,MAAM,gBAAgB,CAAC;QACrB,WAAW,EAAE,oBAAoB;QACjC,MAAM,EAAE,cAAc;QACtB,MAAM,EAAE,GAAG,CAAC,MAAM;KACnB,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,gBAAgB,CAAC,EAC9B,MAAM,EACN,MAAM,EACN,WAAW,GAKZ;IACC,MAAM,IAAA,sBAAK,EAAC,KAAK,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,oBAAoB,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE;QACjF,MAAM;KACP,CAAC,CAAC;AACL,CAAC;AAED,SAAS,0BAA0B,CAAC,GAAW;IAI7C,MAAM,WAAW,GAAG,0BAA0B,CAAC;IAC/C,MAAM,WAAW,GAAG,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAE3C,IAAI,WAAW,EAAE,CAAC;QAChB,OAAO;YACL,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;YACpB,IAAI,EAAE,QAAQ;SACf,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,yBAAyB,CAAC;IAC3C,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAErC,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO;YACL,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;YACjB,IAAI,EAAE,KAAK;SACZ,CAAC;IACJ,CAAC;IAED,OAAO;QACL,IAAI,EAAE,GAAG;QACT,IAAI,EAAE,OAAO;KACd,CAAC;AACJ,CAAC","sourcesContent":["import path from 'path';\n\nimport spawn from '@expo/turtle-spawn';\nimport fs from 'fs-extra';\nimport { ArchiveSource, ArchiveSourceType, Job } from '@expo/eas-build-job';\nimport { bunyan } from '@expo/logger';\nimport downloadFile from '@expo/downloader';\n\nimport { BuildContext } from '../context';\n\nexport async function prepareProjectSourcesAsync<TJob extends Job>(\n  ctx: BuildContext<TJob>,\n  destinationDirectory = ctx.buildDirectory\n): Promise<void> {\n  if (ctx.job.projectArchive.type === ArchiveSourceType.GCS) {\n    throw new Error('GCS project sources should be resolved earlier to url');\n  } else if (ctx.job.projectArchive.type === ArchiveSourceType.PATH) {\n    await prepareProjectSourcesLocallyAsync(ctx, ctx.job.projectArchive.path, destinationDirectory); // used in eas build --local\n  } else if (ctx.job.projectArchive.type === ArchiveSourceType.URL) {\n    await downloadAndUnpackProjectFromTarGzAsync(\n      ctx,\n      ctx.job.projectArchive.url,\n      destinationDirectory\n    );\n  } else if (ctx.job.projectArchive.type === ArchiveSourceType.GIT) {\n    await shallowCloneRepositoryAsync({\n      logger: ctx.logger,\n      archiveSource: ctx.job.projectArchive,\n      destinationDirectory,\n    });\n  }\n}\n\nasync function shallowCloneRepositoryAsync({\n  logger,\n  archiveSource,\n  destinationDirectory,\n}: {\n  logger: bunyan;\n  archiveSource: ArchiveSource & { type: ArchiveSourceType.GIT };\n  destinationDirectory: string;\n}): Promise<void> {\n  const { repositoryUrl } = archiveSource;\n  try {\n    await spawn('git', ['init'], { cwd: destinationDirectory });\n    await spawn('git', ['remote', 'add', 'origin', repositoryUrl], { cwd: destinationDirectory });\n\n    const { gitRef, gitCommitHash } = archiveSource;\n\n    await spawn('git', ['fetch', 'origin', '--depth', '1', '--no-tags', gitCommitHash], {\n      cwd: destinationDirectory,\n    });\n\n    await spawn('git', ['checkout', gitCommitHash], { cwd: destinationDirectory });\n\n    // If we have a gitRef, we try to add it to the repo.\n    if (gitRef) {\n      const { name, type } = getStrippedBranchOrTagName(gitRef);\n      switch (type) {\n        // If the gitRef is for a tag, we add a lightweight tag to current commit.\n        case 'tag': {\n          await spawn('git', ['tag', name], { cwd: destinationDirectory });\n          break;\n        }\n        // gitRef for a branch may come as:\n        // - qualified ref (e.g. refs/heads/feature/add-icon), detected as \"branch\" for a push,\n        // - unqualified ref (e.g. feature/add-icon), detected as \"other\" for a pull request.\n        case 'branch':\n        case 'other': {\n          await spawn('git', ['checkout', '-b', name], { cwd: destinationDirectory });\n          break;\n        }\n      }\n    }\n  } catch (err: any) {\n    const sanitizedUrl = getSanitizedGitUrl(repositoryUrl);\n    if (sanitizedUrl) {\n      logger.error(`Failed to clone git repository: ${sanitizedUrl}.`);\n    } else {\n      logger.error('Failed to clone git repository.');\n    }\n    logger.error(err.stderr);\n    throw err;\n  }\n}\n\nfunction getSanitizedGitUrl(maybeGitUrl: string): string | null {\n  try {\n    const url = new URL(maybeGitUrl);\n    if (url.password) {\n      url.password = '*******';\n    }\n    return url.toString();\n  } catch {\n    return null;\n  }\n}\n\nexport async function downloadAndUnpackProjectFromTarGzAsync<TJob extends Job>(\n  ctx: BuildContext<TJob>,\n  projectArchiveUrl: string,\n  destinationDirectory: string\n): Promise<void> {\n  const projectTarball = path.join(ctx.workingdir, 'project.tar.gz');\n  try {\n    await downloadFile(projectArchiveUrl, projectTarball, { retry: 3 });\n  } catch (err: any) {\n    ctx.reportError?.('Failed to download project archive', err, {\n      extras: { buildId: ctx.env.EAS_BUILD_ID },\n    });\n    throw err;\n  }\n\n  await unpackTarGzAsync({\n    destination: destinationDirectory,\n    source: projectTarball,\n    logger: ctx.logger,\n  });\n}\n\nasync function prepareProjectSourcesLocallyAsync<TJob extends Job>(\n  ctx: BuildContext<TJob>,\n  projectArchivePath: string,\n  destinationDirectory: string\n): Promise<void> {\n  const projectTarball = path.join(ctx.workingdir, 'project.tar.gz');\n  await fs.copy(projectArchivePath, projectTarball);\n\n  await unpackTarGzAsync({\n    destination: destinationDirectory,\n    source: projectTarball,\n    logger: ctx.logger,\n  });\n}\n\nasync function unpackTarGzAsync({\n  logger,\n  source,\n  destination,\n}: {\n  logger: bunyan;\n  source: string;\n  destination: string;\n}): Promise<void> {\n  await spawn('tar', ['-C', destination, '--strip-components', '1', '-zxf', source], {\n    logger,\n  });\n}\n\nfunction getStrippedBranchOrTagName(ref: string): {\n  name: string;\n  type: 'branch' | 'tag' | 'other';\n} {\n  const branchRegex = /(\\/?refs)?\\/?heads\\/(.+)/;\n  const branchMatch = ref.match(branchRegex);\n\n  if (branchMatch) {\n    return {\n      name: branchMatch[2],\n      type: 'branch',\n    };\n  }\n\n  const tagRegex = /(\\/?refs)?\\/?tags\\/(.+)/;\n  const tagMatch = ref.match(tagRegex);\n\n  if (tagMatch) {\n    return {\n      name: tagMatch[2],\n      type: 'tag',\n    };\n  }\n\n  return {\n    name: ref,\n    type: 'other',\n  };\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "1.0.107",
+  "version": "1.0.108",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -25,12 +25,12 @@
     "@expo/config": "8.5.4",
     "@expo/config-plugins": "7.8.4",
     "@expo/downloader": "1.0.57",
-    "@expo/eas-build-job": "1.0.107",
+    "@expo/eas-build-job": "1.0.108",
     "@expo/env": "^0.0.5",
     "@expo/logger": "1.0.57",
     "@expo/package-manager": "1.1.2",
     "@expo/plist": "^0.0.20",
-    "@expo/steps": "1.0.107",
+    "@expo/steps": "1.0.108",
     "@expo/template-file": "1.0.57",
     "@expo/turtle-spawn": "1.0.57",
     "@expo/xcpretty": "^4.3.0",
@@ -70,5 +70,5 @@
     "node": "20.11.0",
     "yarn": "1.22.21"
   },
-  "gitHead": "a5573062f84e2918b503e7e2758615a1172536c8"
+  "gitHead": "74d8c65802f43a3e2419e6e4939d77b4135a2935"
 }