Update test.yml

Author: tgymnich

.github/workflows/test.yml

@@ -9,7 +9,7 @@ jobs:
   build: # make sure build/ci work properly
     strategy:
       matrix:
-        os: [ubuntu-18.04]
+        os: [ubuntu-16.04, ubuntu-18.04, macOS-10.14, macOS-latest]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
@@ -20,14 +20,13 @@ jobs:
     needs: [build]
     strategy:
       matrix:
-        os: [ubuntu-18.04]
+        os: [ubuntu-16.04, ubuntu-18.04, macOS-10.14, macOS-latest]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
     - uses: ./
       with:
         version: '5.1.3'
-        platform: ubuntu-18.04
     - run: swift --version
   publish:
     needs: [build, test]

README.md

@@ -1,20 +1,16 @@
 # setup-swift
 
-This action sets up a swift environment for use in actions by:
-
-- optionally downloading and caching a version of swift by version and adding to PATH.
+This action sets up a swift environment for use in actions.
+Supported platforms are: macOS, ubuntu-16.04, ubuntu-18.04
+For available versions check the release section on [swift.org](https://swift.org/download/#releases).
 
 # Usage
 
-See [action.yml](action.yml)
-
-Basic:
 ```yaml
 steps:
 - uses: actions/checkout@latest
 - uses: TG908/setup-swift@v0
   with:
     version: '5.1.3'
-    platform: 'ubuntu18.04'
 - run: swift build
 ```

action.yml

@@ -9,10 +9,6 @@ inputs:
     description: 'Swift version to use.'
     required: true
     default: '5.1.3'
-  platform:
-    description: 'Platform'
-    required: true
-    default: 'osx'
 runs:
   using: 'node12'
   main: 'dist/index.js'

dist/index.js

@@ -1253,8 +1253,7 @@ function run() {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             const version = core.getInput('version');
-            const platform = core.getInput('platform');
-            yield installer.getSwift(version, platform);
+            yield installer.getSwift(version);
         }
         catch (error) {
             core.setFailed(error.message);
@@ -4565,24 +4564,37 @@ const tc = __importStar(__webpack_require__(533));
 const exec = __importStar(__webpack_require__(986));
 const io = __importStar(__webpack_require__(1));
 const path = __importStar(__webpack_require__(622));
-function getSwift(version, platform) {
+function getSwift(version) {
     return __awaiter(this, void 0, void 0, function* () {
+        // determine os
         if (process.platform === 'darwin') {
-            return getSwiftMacOS(version, platform);
+            return getSwiftMacOS(version);
         }
         else if (process.platform === 'linux') {
-            return getSwiftLinux(version, platform);
+            return getSwiftLinux(version);
         }
         else {
             core.setFailed('Platform not supported');
         }
     });
 }
 exports.getSwift = getSwift;
-function getSwiftLinux(version, platform) {
+function getSwiftLinux(version) {
     return __awaiter(this, void 0, void 0, function* () {
         const swiftBranch = `swift-${version}-release`;
         const swiftVersion = `swift-${version}-RELEASE`;
+        // determine os release
+        let lsbReleaseStdOut = '';
+        const options = {
+            listeners: {
+                stdout: (data) => {
+                    lsbReleaseStdOut += data.toString();
+                }
+            }
+        };
+        yield exec.exec('lsb_release', ['-rs'], options);
+        const platform = `ubuntu${lsbReleaseStdOut.trim()}`;
+        // check cache
         let toolPath = tc.find('Swift', version, platform);
         if (toolPath) {
             core.debug(`Tool found in cache ${toolPath}`);
@@ -4601,11 +4613,12 @@ function getSwiftLinux(version, platform) {
         core.addPath(swiftBin);
     });
 }
-function getSwiftMacOS(version, platform) {
+function getSwiftMacOS(version) {
     return __awaiter(this, void 0, void 0, function* () {
         const swiftBranch = `swift-${version}-release`;
         const swiftVersion = `swift-${version}-RELEASE`;
-        let toolPath = tc.find('Swift', version, platform);
+        // check cache
+        let toolPath = tc.find('Swift', version, 'osx');
         if (toolPath) {
             core.debug(`Tool found in cache ${toolPath}`);
         }
@@ -4622,6 +4635,7 @@ function getSwiftMacOS(version, platform) {
             const swiftDirectory = yield tc.extractTar(swiftPayload, toolchain);
             toolPath = yield tc.cacheDir(swiftDirectory, 'Swift', version, 'osx');
         }
+        // install xcode toolchain
         let stdOut = '';
         const options = {
             listeners: {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-swift-action",
-  "version": "0.0.3",
+  "version": "1.0.0",
   "private": true,
   "description": "Setup a Swift environment",
   "main": "lib/main.js",

src/installer.ts

@@ -4,22 +4,35 @@ import * as exec from '@actions/exec'
 import * as io from '@actions/io'
 import * as path from 'path'
 
-export async function getSwift(
-  version: string,
-  platform: string
-): Promise<void> {
+export async function getSwift(version: string): Promise<void> {
+  // determine os
   if (process.platform === 'darwin') {
-    return getSwiftMacOS(version, platform)
+    return getSwiftMacOS(version)
   } else if (process.platform === 'linux') {
-    return getSwiftLinux(version, platform)
+    return getSwiftLinux(version)
   } else {
     core.setFailed('Platform not supported')
   }
 }
 
-async function getSwiftLinux(version: string, platform: string): Promise<void> {
+async function getSwiftLinux(version: string): Promise<void> {
   const swiftBranch = `swift-${version}-release`
   const swiftVersion = `swift-${version}-RELEASE`
+
+  // determine os release
+  let lsbReleaseStdOut = ''
+
+  const options = {
+    listeners: {
+      stdout: (data: Buffer) => {
+        lsbReleaseStdOut += data.toString()
+      }
+    }
+  }
+
+  await exec.exec('lsb_release', ['-rs'], options)
+  const platform = `ubuntu${lsbReleaseStdOut.trim()}`
+  // check cache
   let toolPath = tc.find('Swift', version, platform)
 
   if (toolPath) {
@@ -44,11 +57,11 @@ async function getSwiftLinux(version: string, platform: string): Promise<void> {
   core.addPath(swiftBin)
 }
 
-async function getSwiftMacOS(version: string, platform: string): Promise<void> {
+async function getSwiftMacOS(version: string): Promise<void> {
   const swiftBranch = `swift-${version}-release`
   const swiftVersion = `swift-${version}-RELEASE`
-
-  let toolPath = tc.find('Swift', version, platform)
+  // check cache
+  let toolPath = tc.find('Swift', version, 'osx')
 
   if (toolPath) {
     core.debug(`Tool found in cache ${toolPath}`)
@@ -76,6 +89,7 @@ async function getSwiftMacOS(version: string, platform: string): Promise<void> {
     toolPath = await tc.cacheDir(swiftDirectory, 'Swift', version, 'osx')
   }
 
+  // install xcode toolchain
   let stdOut = ''
 
   const options = {

src/main.ts

@@ -4,9 +4,8 @@ import * as installer from './installer'
 async function run(): Promise<void> {
   try {
     const version = core.getInput('version')
-    const platform = core.getInput('platform')
 
-    await installer.getSwift(version, platform)
+    await installer.getSwift(version)
   } catch (error) {
     core.setFailed(error.message)
   }