Merge pull request #333 from sidepelican/versioncheck

Fix error output on Linux
swift-actions · Nov 29, 2021 · dea3ae0 · dea3ae0
2 parents a94947b + 85dfe5b
commit dea3ae0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/__tests__/get-version.test.ts b/__tests__/get-version.test.ts
@@ -22,4 +22,11 @@ Target: x86_64-apple-macosx11.0`
     );
     expect(version).toBe("5.5");
   });
+
+  it("identifies version from swift version on linux", async () => {
+    const version = versionFromString(
+      "Swift version 5.5.1 (swift-5.5.1-RELEASE)"
+    );
+    expect(version).toBe("5.5.1");
+  });
 });
diff --git a/dist/index.js b/dist/index.js
@@ -2751,7 +2751,7 @@ function run() {
                 core.setOutput("version", version);
             }
             else {
-                core.error("Failed to setup requested swift version");
+                core.error(`Failed to setup requested swift version. requestd: ${version}, actual: ${current}`);
             }
         }
         catch (error) {
@@ -13725,7 +13725,7 @@ function getVersion(command = "swift", args = ["--version"]) {
 }
 exports.getVersion = getVersion;
 function versionFromString(subject) {
-    const match = subject.match(/Apple\ Swift\ version (?<version>[0-9]+\.[0-9+]+(\.[0-9]+)?)/) || {
+    const match = subject.match(/Swift\ version (?<version>[0-9]+\.[0-9+]+(\.[0-9]+)?)/) || {
         groups: { version: null },
     };
     if (!match.groups || !match.groups.version) {

diff --git a/src/get-version.ts b/src/get-version.ts
@@ -29,7 +29,7 @@ export async function getVersion(
 
 export function versionFromString(subject: string): string | null {
   const match = subject.match(
-    /Apple\ Swift\ version (?<version>[0-9]+\.[0-9+]+(\.[0-9]+)?)/
+    /Swift\ version (?<version>[0-9]+\.[0-9+]+(\.[0-9]+)?)/
   ) || {
     groups: { version: null },
   };

diff --git a/src/main.ts b/src/main.ts
@@ -26,7 +26,9 @@ async function run() {
     if (current === version) {
       core.setOutput("version", version);
     } else {
-      core.error("Failed to setup requested swift version");
+      core.error(
+        `Failed to setup requested swift version. requestd: ${version}, actual: ${current}`
+      );
     }
   } catch (error) {
     let dump: String;