Get stable versions as default (#31)

* Get stable versions as default

-beta suffix after semver will look for beta versions

* Some refactoring

* minor lint fix

Author: einar-notland

README.md

@@ -6,15 +6,17 @@ The list of all available versions can be found in [virtual-environments](https:
 # Available parameters
 | Argument                | Description              | Format    |
 |-------------------------|--------------------------|--------------------|
-| `xcode-version`           | Specify the Xcode version to use | - `latest` or<br> - `latest-stable` or<br> - [SemVer](https://semver.org/) string |
+| `xcode-version`           | Specify the Xcode version to use | - `latest` or<br> - `latest-stable` or<br> - [SemVer](https://semver.org/) string or<br> - [SemVer](https://semver.org/)`-beta` |
 
 **Notes:**
 - `latest-stable` points to the latest stable version of Xcode
 - `latest` *includes* beta releases that GitHub actions has installed
 - SemVer examples: `10`, `11.4`, `12.0`, `11.7.0`, `^11.7.0` (find more examples in [SemVer cheatsheet](https://devhints.io/semver))
+- `-beta` suffix after SemVer will only select among beta releases that GitHub actions has installed
 - If sets a specific version, wraps it to single quotes in YAML like `'12.0'` to pass it as string because GitHub trimmes trailing `.0` from numbers
 
 # Usage
+
 Set the latest stable Xcode version:
 ```
 jobs:
@@ -37,7 +39,7 @@ jobs:
         xcode-version: latest
 ```
 
-Set the specific version of Xcode:
+Set the specific stable version of Xcode:
 ```
 jobs:
   build:
@@ -47,5 +49,16 @@ jobs:
       with:
         xcode-version: '12.0'
 ```
+
+Set the specific beta version of Xcode:
+```
+jobs:
+  build:
+    runs-on: macos-latest
+    steps:
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: '12.0-beta'
+```
 # License
 The scripts and documentation in this project are released under the [MIT License](LICENSE)

__tests__/xcode-selector.test.ts

@@ -9,6 +9,7 @@ jest.mock("child_process");
 const fakeGetXcodeVersionInfoResult: xcodeUtils.XcodeVersion[] = [
     { version: "10.3.0", buildNumber: "", path: "/Applications/Xcode_10.3.app", releaseType: "GM", stable: true },
     { version: "12.0.0", buildNumber: "", path: "/Applications/Xcode_12_beta.app", releaseType: "Beta", stable: false },
+    { version: "12.0.0", buildNumber: "", path: "/Applications/Xcode_12.app", releaseType: "GM", stable: true },
     { version: "11.2.1", buildNumber: "", path: "/Applications/Xcode_11.2.1.app", releaseType: "GM", stable: true },
     { version: "11.4.0", buildNumber: "", path: "/Applications/Xcode_11.4.app", releaseType: "GM", stable: true },
     { version: "11.0.0", buildNumber: "", path: "/Applications/Xcode_11.app", releaseType: "GM", stable: true },
@@ -17,6 +18,7 @@ const fakeGetXcodeVersionInfoResult: xcodeUtils.XcodeVersion[] = [
 const fakeGetInstalledXcodeAppsResult: string[] = [
     "/Applications/Xcode_10.3.app",
     "/Applications/Xcode_12_beta.app",
+    "/Applications/Xcode_12.app",
     "/Applications/Xcode_11.2.1.app",
     "/Applications/Xcode_11.4.app",
     "/Applications/Xcode_11.app",
@@ -25,6 +27,7 @@ const fakeGetInstalledXcodeAppsResult: string[] = [
 ];
 const expectedGetAllVersionsResult: xcodeUtils.XcodeVersion[] = [
     { version: "12.0.0", buildNumber: "", path: "/Applications/Xcode_12_beta.app", releaseType: "Beta", stable: false },
+    { version: "12.0.0", buildNumber: "", path: "/Applications/Xcode_12.app", releaseType: "GM", stable: true },
     { version: "11.4.0", buildNumber: "", path: "/Applications/Xcode_11.4.app", releaseType: "GM", stable: true },
     { version: "11.2.1", buildNumber: "", path: "/Applications/Xcode_11.2.1.app", releaseType: "GM", stable: true },
     { version: "11.2.0", buildNumber: "", path: "/Applications/Xcode_11.2.app", releaseType: "GM", stable: true },
@@ -52,23 +55,28 @@ describe("XcodeSelector", () => {
 
     describe("findVersion", () => {
         it.each([
-            ["latest", "12.0.0"],
-            ["latest-stable", "11.4.0"],
-            ["11", "11.4.0"],
-            ["11.x", "11.4.0"],
-            ["11.2.x", "11.2.1"],
-            ["11.2.0", "11.2.0"],
-            ["10.x", "10.3.0"],
-            ["~11.2.0", "11.2.1"],
-            ["^11.2.0", "11.4.0"],
-            ["< 11.0", "10.3.0"],
-            ["10.0.0 - 11.2.0", "11.2.0"],
-            ["give me latest version", null]
-        ] as [string, string | null][])("'%s' -> '%s'", (versionSpec: string, expected: string | null) => {
+            ["latest-stable", "12.0.0", true],
+            ["latest", "12.0.0", false],
+            ["11", "11.4.0", true],
+            ["11.x", "11.4.0", true],
+            ["11.2.x", "11.2.1", true],
+            ["11.2.0", "11.2.0", true],
+            ["10.x", "10.3.0", true],
+            ["~11.2.0", "11.2.1", true],
+            ["^11.2.0", "11.4.0", true],
+            ["< 11.0", "10.3.0", true],
+            ["10.0.0 - 11.2.0", "11.2.0", true],
+            ["12.0-beta", "12.0.0", false],
+            ["12.0", "12.0.0", true],
+            ["give me latest version", null, null]
+        ] as [string, string | null, boolean | null][])("'%s' -> '%s'", (versionSpec: string, expected: string | null, expectedStable: boolean | null) => {
             const sel = new XcodeSelector();
             sel.getAllVersions = (): xcodeUtils.XcodeVersion[] => expectedGetAllVersionsResult;
-            const matchedVersion = sel.findVersion(versionSpec)?.version ?? null;
+            const xcodeVersion = sel.findVersion(versionSpec)
+            const matchedVersion = xcodeVersion?.version ?? null;
+            const isStable = xcodeVersion?.stable ?? null;
             expect(matchedVersion).toBe(expected);
+            expect(isStable).toBe(expectedStable);
         });
     });
 

dist/index.js

@@ -116,7 +116,15 @@ class XcodeSelector {
         if (versionSpec === "latest-stable") {
             return availableVersions.filter(ver => ver.stable)[0];
         }
-        return (_a = availableVersions.find(ver => semver.satisfies(ver.version, versionSpec))) !== null && _a !== void 0 ? _a : null;
+        const betaSuffix = "-beta";
+        let isStable = true;
+        if (versionSpec.endsWith(betaSuffix)) {
+            isStable = false;
+            versionSpec = versionSpec.slice(0, -betaSuffix.length);
+        }
+        return ((_a = availableVersions
+            .filter(ver => ver.stable === isStable)
+            .find(ver => semver.satisfies(ver.version, versionSpec))) !== null && _a !== void 0 ? _a : null);
     }
     setVersion(xcodeVersion) {
         if (!fs.existsSync(xcodeVersion.path)) {

src/xcode-selector.ts

@@ -29,7 +29,18 @@ export class XcodeSelector {
             return availableVersions.filter(ver => ver.stable)[0];
         }
 
-        return availableVersions.find(ver => semver.satisfies(ver.version, versionSpec)) ?? null;
+        const betaSuffix = "-beta";
+        let isStable = true;
+        if (versionSpec.endsWith(betaSuffix)) {
+            isStable = false;
+            versionSpec = versionSpec.slice(0, -betaSuffix.length);
+        }
+
+        return (
+            availableVersions
+                .filter(ver => ver.stable === isStable)
+                .find(ver => semver.satisfies(ver.version, versionSpec)) ?? null
+        );
     }
 
     setVersion(xcodeVersion: XcodeVersion): void {