[email protected]

- fix branch name in test details
buildalon · Oct 18, 2024 · 127e03e · 127e03e
1 parent 7acc54f
commit 127e03e
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 13 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -58696,6 +58696,8 @@ async function GetProjectDetails() {
     let infoPlistContent = plist.parse(fs.readFileSync(infoPlistPath, 'utf8'));
     const versionString = infoPlistContent['CFBundleShortVersionString'];
     core.info(`Version string: ${versionString}`);
+    const buildString = infoPlistContent['CFBundleVersion'];
+    core.info(`Build string: ${buildString}`);
     return new XcodeProject_1.XcodeProject(projectPath, projectName, platform, bundleId, projectDirectory, versionString, scheme);
 }
 async function parseBuildSettings(projectPath, scheme) {
@@ -59299,19 +59301,23 @@ async function getWhatsNew() {
         const branchNameDetails = await execGit(['log', head, '-1', '--format=%d']);
         const branchNameMatch = branchNameDetails.match(/\((?<branch>.+)\)/);
         let branchName = '';
-        if (branchNameMatch) {
+        if (branchNameMatch && branchNameMatch.groups) {
+            branchName = branchNameMatch.groups.branch;
             if (branchName.includes(' -> ')) {
                 branchName = branchName.split(' -> ')[1];
             }
             if (branchName.includes(',')) {
                 branchName = branchName.split(',')[1];
             }
-            if (branchName.includes('origin/')) {
-                branchName = branchName.split('origin/')[1];
+            if (branchName.includes('/')) {
+                branchName = branchName.split('/')[1];
             }
         }
-        const commitMessage = await execGit(['log', head, '-1', '--format=%s']);
+        const commitMessage = await execGit(['log', head, '-1', '--format=%B']);
         whatsNew = `[${commitSha.trim()}]${branchName.trim()}\n${commitMessage.trim()}`;
+        if (whatsNew.length > 4000) {
+            whatsNew = `${whatsNew.substring(0, 3997)}...`;
+        }
     }
     if (whatsNew.length === 0) {
         throw new Error('Test details empty!');

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.1.0",
+  "version": "1.1.1",
   "description": "A GitHub Action to build, archive, and upload Unity exported xcode projects.",
   "author": "buildalon",
   "license": "MIT",

diff --git a/src/xcode.ts b/src/xcode.ts
@@ -59,6 +59,8 @@ async function GetProjectDetails(): Promise<XcodeProject> {
     let infoPlistContent = plist.parse(fs.readFileSync(infoPlistPath, 'utf8'));
     const versionString = infoPlistContent['CFBundleShortVersionString'];
     core.info(`Version string: ${versionString}`);
+    const buildString = infoPlistContent['CFBundleVersion'];
+    core.info(`Build string: ${buildString}`);
     return new XcodeProject(
         projectPath,
         projectName,
@@ -93,7 +95,8 @@ async function parseBuildSettings(projectPath: string, scheme: string): Promise<
     if (!platformName) {
         throw new Error('Unable to determine the platform name from the build settings');
     }
-    const bundleId = core.getInput('bundle-id') || matchRegexPattern(buildSettingsOutput, /\s+PRODUCT_BUNDLE_IDENTIFIER = (?<bundleId>[\w.-]+)/, 'bundleId'); if (!bundleId || bundleId === 'NO') {
+    const bundleId = core.getInput('bundle-id') || matchRegexPattern(buildSettingsOutput, /\s+PRODUCT_BUNDLE_IDENTIFIER = (?<bundleId>[\w.-]+)/, 'bundleId');
+    if (!bundleId || bundleId === 'NO') {
         throw new Error('Unable to determine the bundle ID from the build settings');
     }
     const platforms = {
@@ -670,19 +673,23 @@ async function getWhatsNew(): Promise<string> {
         const branchNameDetails = await execGit(['log', head, '-1', '--format=%d']);
         const branchNameMatch = branchNameDetails.match(/\((?<branch>.+)\)/);
         let branchName = '';
-        if (branchNameMatch) {
+        if (branchNameMatch && branchNameMatch.groups) {
+            branchName = branchNameMatch.groups.branch;
             if (branchName.includes(' -> ')) {
                 branchName = branchName.split(' -> ')[1];
             }
             if (branchName.includes(',')) {
                 branchName = branchName.split(',')[1];
             }
-            if (branchName.includes('origin/')) {
-                branchName = branchName.split('origin/')[1];
+            if (branchName.includes('/')) {
+                branchName = branchName.split('/')[1];
             }
         }
-        const commitMessage = await execGit(['log', head, '-1', '--format=%s']);
+        const commitMessage = await execGit(['log', head, '-1', '--format=%B']);
         whatsNew = `[${commitSha.trim()}]${branchName.trim()}\n${commitMessage.trim()}`;
+        if (whatsNew.length > 4000) {
+            whatsNew = `${whatsNew.substring(0, 3997)}...`;
+        }
     }
     if (whatsNew.length === 0) {
         throw new Error('Test details empty!');