[email protected]

- fix latest release matching

dist/index.js

@@ -34826,19 +34826,17 @@ async function Unity(version, changeset, architecture, modules) {
 }
 async function getLatestRelease(version, isSilicon) {
  const releases = (await execUnityHub([`editors`, `--releases`])).split('\n');
- for (const release of releases) {
- if (!release || release.trim().length === 0) {
- continue;
- }
- const semVersion = semver.coerce(version);
- const semVerRelease = semver.coerce(release);
- core.debug(`Checking ${semVersion} against ${semVerRelease}`);
- if (semver.satisfies(semVerRelease, `^${semVersion}`)) {
- const match = release.match(/(?<version>\d+\.\d+\.\d+[fab]?\d*)\s*(?:\((?<arch>Apple silicon|Intel)\))?/);
- if (match && match.groups && match.groups.version) {
- core.info(`Found Unity ${match.groups.version}`);
- return [match.groups.version, undefined];
- }
+ const semVersion = semver.coerce(version);
+ const validReleases = releases
+ .map(release => semver.coerce(release))
+ .filter(release => release && semver.satisfies(release, `^${semVersion}`))
+ .sort((a, b) => semver.compare(b, a));
+ for (const release of validReleases) {
+ const originalRelease = releases.find(r => r.includes(release.version));
+ const match = originalRelease.match(/(?<version>\d+\.\d+\.\d+[fab]?\d*)\s*(?:\((?<arch>Apple silicon|Intel)\))?/);
+ if (match && match.groups && match.groups.version) {
+ core.info(`Found Unity ${match.groups.version}`);
+ return [match.groups.version, undefined];
  }
  }
  core.info(`Searching for Unity ${version} release...`);

package.json

@@ -1,6 +1,6 @@
 {
  "name": "unity-setup",
- "version": "1.0.7",
+ "version": "1.0.8",
  "description": "A GitHub action for setting up the Unity Game Engine for CI/CD workflows.",
  "author": "RageAgainstThePixel",
  "license": "MIT",
@@ -41,6 +41,7 @@
  "scripts": {
  "build": "npm run clean && npm run bundle",
  "bundle": "ncc build src/index.ts -o dist --source-map --license licenses.txt",
+ "watch": "ncc build src/index.ts -o dist --source-map --license licenses.txt --watch",
  "clean": "npm install && shx rm -rf dist/ out/ node_modules/ && npm ci"
  }
 }

src/unity-hub.ts

@@ -263,17 +263,17 @@ async function Unity(version: string, changeset: string, architecture: string, m
 
 async function getLatestRelease(version: string, isSilicon: boolean): Promise<[string, string]> {
  const releases = (await execUnityHub([`editors`, `--releases`])).split('\n');
- for (const release of releases) {
-  if (!release || release.trim().length === 0) { continue; }
- const semVersion = semver.coerce(version);
- const semVerRelease = semver.coerce(release);
- core.debug(`Checking ${semVersion} against ${semVerRelease}`);
-  if (semver.satisfies(semVerRelease, `^${semVersion}`)) {
-  const match = release.match(/(?<version>\d+\.\d+\.\d+[fab]?\d*)\s*(?:\((?<arch>Apple silicon|Intel)\))?/);
-  if (match && match.groups && match.groups.version) {
-  core.info(`Found Unity ${match.groups.version}`);
-  return [match.groups.version, undefined];
- }
+ const semVersion = semver.coerce(version);
+ const validReleases = releases
+ .map(release => semver.coerce(release))
+ .filter(release => release && semver.satisfies(release, `^${semVersion}`))
+ .sort((a, b) => semver.compare(b, a));
+ for (const release of validReleases) {
+ const originalRelease = releases.find(r => r.includes(release.version));
+ const match = originalRelease.match(/(?<version>\d+\.\d+\.\d+[fab]?\d*)\s*(?:\((?<arch>Apple silicon|Intel)\))?/);
+ if (match && match.groups && match.groups.version) {
+ core.info(`Found Unity ${match.groups.version}`);
+ return [match.groups.version, undefined];
  }
  }
  core.info(`Searching for Unity ${version} release...`);
@@ -289,7 +289,7 @@ async function getLatestRelease(version: string, isSilicon: boolean): Promise<[s
 async function parseReleases(version: string, data: string): Promise<[string, string]> {
  const releases = JSON.parse(data);
  core.debug(`Found ${releases.official.length} official releases...`);
- releases.official.sort((a, b) => semver.compare(a.version, b.version, true));
+ releases.official.sort((a: any, b: any) => semver.compare(a.version, b.version, true));
  for (const release of releases.official) {
  const semVersion = semver.coerce(version);
  const semVerRelease = semver.coerce(release.version);

tsconfig.json

@@ -10,6 +10,7 @@
  "forceConsistentCasingInFileNames": true,
  "outDir": "dist",
  "declaration": false,
+ "noEmit": true,
  },
  "compileOnSave": true,
  "include": [