Merge branch 'main' into test/macos-15

buildalon · Oct 8, 2024 · f3c4f82 · f3c4f82
2 parents 8187e68 + bcf3ee1
commit f3c4f82
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -40911,6 +40911,13 @@ async function ExportXcodeArchive(projectRef) {
  }
  await execWithXcBeautify(exportArgs);
  projectRef.exportPath = exportPath;
+ const globPath = `${exportPath}/**/*.ipa\n${exportPath}/**/*.app`;
+ const globber = await glob.create(globPath);
+ const files = await globber.glob();
+ if (files.length === 0) {
+ throw new Error(`No IPA or APP file found in the export path.\n${globPath}`);
+ }
+ core.setOutput('executable', files[0]);
  core.info(`Exported: ${exportPath}`);
  return projectRef;
 }
@@ -43021,7 +43028,6 @@ const main = async () => {
  let projectRef = await (0, xcode_1.GetProjectDetails)();
  projectRef.credential = credential;
  projectRef = await (0, xcode_1.ArchiveXcodeProject)(projectRef);
- core.setOutput('executable', projectRef.archivePath);
  projectRef = await (0, xcode_1.ExportXcodeArchive)(projectRef);
  core.setOutput('output-directory', projectRef.exportPath);
  }

diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "unity-xcode-builder",
- "version": "1.0.0",
+ "version": "1.0.1",
  "description": "A GitHub Action to build and archive Unity exported xcode projects.",
  "author": "buildalon",
  "license": "MIT",

diff --git a/src/index.ts b/src/index.ts
@@ -26,7 +26,6 @@ const main = async () => {
  let projectRef = await GetProjectDetails();
  projectRef.credential = credential;
  projectRef = await ArchiveXcodeProject(projectRef);
- core.setOutput('executable', projectRef.archivePath);
  projectRef = await ExportXcodeArchive(projectRef);
  core.setOutput('output-directory', projectRef.exportPath);
  } else {

diff --git a/src/xcode.ts b/src/xcode.ts
@@ -172,6 +172,13 @@ async function ExportXcodeArchive(projectRef: XcodeProject): Promise<XcodeProjec
  }
  await execWithXcBeautify(exportArgs);
  projectRef.exportPath = exportPath;
+ const globPath = `${exportPath}/**/*.ipa\n${exportPath}/**/*.app`;
+ const globber = await glob.create(globPath);
+ const files = await globber.glob();
+ if (files.length === 0) {
+ throw new Error(`No IPA or APP file found in the export path.\n${globPath}`);
+ }
+ core.setOutput('executable', files[0]);
  core.info(`Exported: ${exportPath}`);
  return projectRef;
 }