Add final completion check

Author: fwal

lib/get-version.js

@@ -0,0 +1,38 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const exec_1 = require("@actions/exec");
+function getVersion(command = 'swift', args = ['--version']) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let output = '';
+        let error = '';
+        const options = {
+            listeners: {
+                stdout: (data) => {
+                    output += data.toString();
+                },
+                stderr: (data) => {
+                    error += data.toString();
+                }
+            }
+        };
+        yield exec_1.exec(command, args, options);
+        if (error) {
+            throw new Error(error);
+        }
+        const match = output.match(/(?<version>[0-9]+\.[0-9+]+(\.[0-9]+)?)/) || { groups: { version: null } };
+        if (!match.groups || !match.groups.version) {
+            return null;
+        }
+        return match.groups.version;
+    });
+}
+exports.getVersion = getVersion;

lib/macos-install.js

@@ -22,6 +22,7 @@ const io = __importStar(require("@actions/io"));
 const path = __importStar(require("path"));
 const exec_1 = require("@actions/exec");
 const swift_versions_1 = require("./swift-versions");
+const get_version_1 = require("./get-version");
 function install(version, system) {
     return __awaiter(this, void 0, void 0, function* () {
         const toolchainName = `swift ${version}`;
@@ -49,27 +50,7 @@ function install(version, system) {
 exports.install = install;
 function toolchainVersion(requestedVersion) {
     return __awaiter(this, void 0, void 0, function* () {
-        let output = '';
-        let error = '';
-        const options = {
-            listeners: {
-                stdout: (data) => {
-                    output += data.toString();
-                },
-                stderr: (data) => {
-                    error += data.toString();
-                }
-            }
-        };
-        yield exec_1.exec('xcrun', ['--toolchain', requestedVersion, '--run', 'swift', '--version'], options);
-        if (error) {
-            throw new Error(error);
-        }
-        const match = output.match(/(?<version>[0-9]+\.[0-9+]+(\.[0-9]+)?)/) || { groups: { version: null } };
-        if (!match.groups || !match.groups.version) {
-            return null;
-        }
-        return match.groups.version;
+        return yield get_version_1.getVersion('xcrun', ['--toolchain', requestedVersion, '--run', 'swift', '--version']);
     });
 }
 function download({ url }) {

lib/main.js

@@ -21,9 +21,11 @@ const system = __importStar(require("./os"));
 const versions = __importStar(require("./swift-versions"));
 const macos = __importStar(require("./macos-install"));
 const linux = __importStar(require("./linux-install"));
+const get_version_1 = require("./get-version");
 function run() {
     return __awaiter(this, void 0, void 0, function* () {
-        let version = versions.verify(core.getInput('swift-version', { required: true }));
+        const requestedVersion = core.getInput('swift-version', { required: true });
+        let version = versions.verify(requestedVersion);
         let platform = yield system.getSystem();
         switch (platform.os) {
             case system.OS.MacOS:
@@ -33,6 +35,10 @@ function run() {
                 yield linux.install(version, platform);
                 break;
         }
+        const current = yield get_version_1.getVersion();
+        if (current !== requestedVersion) {
+            core.error('Failed to setup requested swift version');
+        }
     });
 }
 run();

src/get-version.ts

@@ -0,0 +1,31 @@
+import { exec } from '@actions/exec'
+
+export async function getVersion(command: string = 'swift', args: string[] = ['--version']) {
+  let output = ''
+  let error = ''
+
+  const options = {
+    listeners: {
+      stdout: (data: Buffer) => {
+        output += data.toString()
+      },
+      stderr: (data: Buffer) => {
+        error += data.toString()
+      }
+    }
+  }
+
+  await exec(command, args, options)
+
+  if (error) {
+    throw new Error(error)
+  }
+
+  const match = output.match(/(?<version>[0-9]+\.[0-9+]+(\.[0-9]+)?)/) || { groups: { version: null } }
+
+  if (!match.groups || !match.groups.version) {
+    return null
+  }
+
+  return match.groups.version
+}

src/macos-install.ts

@@ -5,6 +5,7 @@ import * as path from 'path'
 import { exec } from '@actions/exec'
 import { System } from './os'
 import { swiftPackage, Package } from './swift-versions'
+import { getVersion } from './get-version'
 
 export async function install(version: string, system: System) {
 
@@ -38,33 +39,7 @@ export async function install(version: string, system: System) {
 }
 
 async function toolchainVersion(requestedVersion: string) {
-  let output = ''
-  let error = ''
-
-  const options = {
-    listeners: {
-      stdout: (data: Buffer) => {
-        output += data.toString()
-      },
-      stderr: (data: Buffer) => {
-        error += data.toString()
-      }
-    }
-  }
-
-  await exec('xcrun', ['--toolchain', requestedVersion, '--run', 'swift', '--version'], options)
-
-  if (error) {
-    throw new Error(error)
-  }
-
-  const match = output.match(/(?<version>[0-9]+\.[0-9+]+(\.[0-9]+)?)/) || { groups: { version: null } }
-
-  if (!match.groups || !match.groups.version) {
-    return null
-  }
-
-  return match.groups.version
+  return await getVersion('xcrun', ['--toolchain', requestedVersion, '--run', 'swift', '--version'])
 }
 
 async function download({ url }: Package) {

src/main.ts

@@ -3,9 +3,11 @@ import * as system from './os'
 import * as versions from './swift-versions'
 import * as macos from './macos-install'
 import * as linux from './linux-install'
+import { getVersion } from './get-version'
 
 async function run() {
-  let version = versions.verify(core.getInput('swift-version', { required: true }))
+  const requestedVersion = core.getInput('swift-version', { required: true })
+  let version = versions.verify(requestedVersion)
 
   let platform = await system.getSystem()
   switch (platform.os) {
@@ -16,6 +18,11 @@ async function run() {
       await linux.install(version, platform)
       break
   }
+
+  const current = await getVersion()
+  if (current !== requestedVersion) {
+    core.error('Failed to setup requested swift version')
+  }
 }
 
 run();