[email protected] (#4)

- fixed `unity-version` not properly overriding version in `version-file`. - fixed `version-file` not properly being found when using relative paths.
buildalon · Aug 7, 2024 · b736c67 · b736c67
1 parent c8dedf1
commit b736c67
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 20 deletions.
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -26,6 +26,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-13, macos-latest]
         unity-versions:
+          - 'in version file'
           - 2019.4.40f1 (ffc62b691db5)
           - 2020.3.48f1 (b805b124c6b7)
           - 2021.3.41f1 (6c5a9e20c022)
@@ -54,6 +55,7 @@ jobs:
 
       - uses: ./ # buildalon/unity-setup
         with:
+          version-file: com.utilities.buildpipline/Utilities.BuildPipeline/ProjectSettings/ProjectVersion.txt
           unity-version: ${{ matrix.unity-versions }}
           build-targets: ${{ matrix.build-targets }}
           modules: ${{ matrix.modules }}

diff --git a/README.md b/README.md
@@ -12,7 +12,13 @@ A GitHub Action for setting up the [Unity Game Engine](https://unity.com) on Git
 strategy:
   matrix:
     os: [ubuntu-latest, windows-latest, macos-13, macos-latest]
-    unity-versions: [2020.3.48f1 (b805b124c6b7), 2021.3.41f1 (6c5a9e20c022), 2022.3.40f1 (cbdda657d2f0)]
+    unity-versions:
+      - 'in version file'
+      - 2019.4.40f1 (ffc62b691db5)
+      - 2020.3.48f1 (b805b124c6b7)
+      - 2021.3.41f1 (6c5a9e20c022)
+      - 2022.3.40f1 (cbdda657d2f0)
+      - 6000.0.13f1 (53a692e3fca9)
     include:
       - os: ubuntu-latest
         build-targets: StandaloneLinux64, Android, iOS

diff --git a/action.yml b/action.yml
@@ -13,7 +13,7 @@ inputs:
     required: false
     default: ''
   build-targets:
-    description: 'Specify the build targets to install modules for. One or more of `StandaloneWindows64` `WSAPlayer` `StandaloneOSX` `iOS` `StandaloneLinux64` `Android` `Lumin` `WebGL`.'
+    description: 'Specify the build targets to install modules for. One or more of `StandaloneWindows64` `WSAPlayer` `StandaloneOSX` `iOS` `StandaloneLinux64` `Android` `Lumin` `WebGL` `VisionOS`.'
     required: false
     default: ''
   modules:

diff --git a/dist/index.js b/dist/index.js
@@ -31192,7 +31192,7 @@ async function ValidateInputs() {
     const [unityVersion, changeset] = await getUnityVersionFromFile(versionFilePath);
     const versions = getUnityVersionsFromInput();
     const pathInput = core.getInput('version-file');
-    const overrideVersion = (pathInput === '' || pathInput === undefined) && versions.length > 0;
+    const overrideVersion = pathInput && pathInput.length > 0 && versions.length > 0;
     if (versions.length > 0) {
         const version = versions.find(([v, c]) => v === unityVersion && c === changeset);
         if (!version && !overrideVersion) {
@@ -31286,21 +31286,28 @@ function getDefaultModules() {
 
 async function getVersionFilePath() {
     let projectVersionPath = core.getInput('version-file');
-    if (!projectVersionPath) {
-        projectVersionPath = await FindGlobPattern(path.join(process.env.GITHUB_WORKSPACE, '**/ProjectVersion.txt'));
+    if (projectVersionPath) {
     } else {
-        core.info(`projectVersionPath: ${projectVersionPath}`);
+        projectVersionPath = await FindGlobPattern(path.join(process.env.GITHUB_WORKSPACE, '**', 'ProjectVersion.txt'));
     }
     try {
         await fs.access(projectVersionPath, fs.constants.R_OK);
         return projectVersionPath;
     } catch (error) {
+        core.debug(error);
         try {
-            projectVersionPath = await FindGlobPattern(projectVersionPath);
+            projectVersionPath = path.join(process.env.GITHUB_WORKSPACE, projectVersionPath);
             await fs.access(projectVersionPath, fs.constants.R_OK);
             return projectVersionPath;
         } catch (error) {
-            // ignore
+            core.error(error);
+            try {
+                projectVersionPath = await FindGlobPattern(path.join(process.env.GITHUB_WORKSPACE, '**', 'ProjectVersion.txt'));
+                await fs.access(projectVersionPath, fs.constants.R_OK);
+                return projectVersionPath;
+            } catch (error) {
+                core.debug(error);
+            }
         }
         throw Error(`Could not find ProjectVersion.txt in ${projectVersionPath}`);
     }
@@ -31309,7 +31316,7 @@ async function getVersionFilePath() {
 function getUnityVersionsFromInput() {
     const versions = [];
     const inputVersions = core.getInput('unity-version');
-    if (!inputVersions) {
+    if (!inputVersions || inputVersions.length == 0) {
         return versions;
     }
     const versionRegEx = new RegExp(/(?<version>(?:(?<major>\d+)\.)?(?:(?<minor>\d+)\.)?(?:(?<patch>\d+[fab]\d+)\b))\s?(?:\((?<changeset>\w+)\))?/g);

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

diff --git a/src/inputs.js b/src/inputs.js
@@ -47,7 +47,7 @@ async function ValidateInputs() {
     const [unityVersion, changeset] = await getUnityVersionFromFile(versionFilePath);
     const versions = getUnityVersionsFromInput();
     const pathInput = core.getInput('version-file');
-    const overrideVersion = (pathInput === '' || pathInput === undefined) && versions.length > 0;
+    const overrideVersion = pathInput && pathInput.length > 0 && versions.length > 0;
     if (versions.length > 0) {
         const version = versions.find(([v, c]) => v === unityVersion && c === changeset);
         if (!version && !overrideVersion) {
@@ -141,21 +141,28 @@ function getDefaultModules() {
 
 async function getVersionFilePath() {
     let projectVersionPath = core.getInput('version-file');
-    if (!projectVersionPath) {
-        projectVersionPath = await FindGlobPattern(path.join(process.env.GITHUB_WORKSPACE, '**/ProjectVersion.txt'));
+    if (projectVersionPath) {
     } else {
-        core.info(`projectVersionPath: ${projectVersionPath}`);
+        projectVersionPath = await FindGlobPattern(path.join(process.env.GITHUB_WORKSPACE, '**', 'ProjectVersion.txt'));
     }
     try {
         await fs.access(projectVersionPath, fs.constants.R_OK);
         return projectVersionPath;
     } catch (error) {
+        core.debug(error);
         try {
-            projectVersionPath = await FindGlobPattern(projectVersionPath);
+            projectVersionPath = path.join(process.env.GITHUB_WORKSPACE, projectVersionPath);
             await fs.access(projectVersionPath, fs.constants.R_OK);
             return projectVersionPath;
         } catch (error) {
-            // ignore
+            core.error(error);
+            try {
+                projectVersionPath = await FindGlobPattern(path.join(process.env.GITHUB_WORKSPACE, '**', 'ProjectVersion.txt'));
+                await fs.access(projectVersionPath, fs.constants.R_OK);
+                return projectVersionPath;
+            } catch (error) {
+                core.debug(error);
+            }
         }
         throw Error(`Could not find ProjectVersion.txt in ${projectVersionPath}`);
     }
@@ -164,7 +171,7 @@ async function getVersionFilePath() {
 function getUnityVersionsFromInput() {
     const versions = [];
     const inputVersions = core.getInput('unity-version');
-    if (!inputVersions) {
+    if (!inputVersions || inputVersions.length == 0) {
         return versions;
     }
     const versionRegEx = new RegExp(/(?<version>(?:(?<major>\d+)\.)?(?:(?<minor>\d+)\.)?(?:(?<patch>\d+[fab]\d+)\b))\s?(?:\((?<changeset>\w+)\))?/g);