[email protected] (#3)

- Fix `androidTargetSdk` version parse
buildalon · Aug 6, 2024 · c8dedf1 · c8dedf1
1 parent 2516a28
commit c8dedf1
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 18 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -31352,15 +31352,16 @@ const path = __nccwpck_require__(1017);
 const os = __nccwpck_require__(2037);
 
 async function CheckAndroidSdkInstalled(editorPath, projectPath) {
-    core.startGroup('Validating Android Target SDK Installed...');
     let sdkPath = undefined;
+    await createRepositoryCfg();
+    const rootEditorPath = await GetEditorRootPath(editorPath);
+    const projectSettingsPath = path.join(projectPath, 'ProjectSettings/ProjectSettings.asset');
+    const projectSettingsContent = await ReadFileContents(projectSettingsPath);
+    const androidTargetSdk = parseInt(projectSettingsContent.match(/(?<=AndroidTargetSdkVersion: )\d+/));
+    core.debug(`AndroidTargetSdkVersion:\n  > ${androidTargetSdk}`);
+    if (androidTargetSdk === undefined || androidTargetSdk === 0) { return; }
+    core.startGroup('Validating Android Target SDK Installed...');
     try {
-        await createRepositoryCfg();
-        const rootEditorPath = await GetEditorRootPath(editorPath);
-        const projectSettingsPath = path.join(projectPath, 'ProjectSettings/ProjectSettings.asset');
-        const projectSettingsContent = await ReadFileContents(projectSettingsPath);
-        const androidTargetSdk = projectSettingsContent.match(/(?<=AndroidTargetSdkVersion: )\d+/);
-        if (androidTargetSdk === undefined || androidTargetSdk === 0) { return; }
         sdkPath = await getAndroidSdkPath(rootEditorPath, androidTargetSdk);
         if (sdkPath) {
             core.info(`Target Android SDK android-${androidTargetSdk} Installed in:\n  > "${sdkPath}"`);

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-setup",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A GitHub action for setting up the Unity Game Engine for CI/CD workflows.",
   "author": "Buildalon",
   "license": "MIT",

diff --git a/src/install-android-sdk.js b/src/install-android-sdk.js
@@ -6,15 +6,16 @@ const path = require('path');
 const os = require('os');
 
 async function CheckAndroidSdkInstalled(editorPath, projectPath) {
-    core.startGroup('Validating Android Target SDK Installed...');
     let sdkPath = undefined;
+    await createRepositoryCfg();
+    const rootEditorPath = await GetEditorRootPath(editorPath);
+    const projectSettingsPath = path.join(projectPath, 'ProjectSettings/ProjectSettings.asset');
+    const projectSettingsContent = await ReadFileContents(projectSettingsPath);
+    const androidTargetSdk = parseInt(projectSettingsContent.match(/(?<=AndroidTargetSdkVersion: )\d+/));
+    core.debug(`AndroidTargetSdkVersion:\n  > ${androidTargetSdk}`);
+    if (androidTargetSdk === undefined || androidTargetSdk === 0) { return; }
+    core.startGroup('Validating Android Target SDK Installed...');
     try {
-        await createRepositoryCfg();
-        const rootEditorPath = await GetEditorRootPath(editorPath);
-        const projectSettingsPath = path.join(projectPath, 'ProjectSettings/ProjectSettings.asset');
-        const projectSettingsContent = await ReadFileContents(projectSettingsPath);
-        const androidTargetSdk = projectSettingsContent.match(/(?<=AndroidTargetSdkVersion: )\d+/);
-        if (androidTargetSdk === undefined || androidTargetSdk === 0) { return; }
         sdkPath = await getAndroidSdkPath(rootEditorPath, androidTargetSdk);
         if (sdkPath) {
             core.info(`Target Android SDK android-${androidTargetSdk} Installed in:\n  > "${sdkPath}"`);