Merge branch 'release/2.0.2' into main

sinoru · Mar 2, 2021 · ce50841 · ce50841
2 parents e798f76 + 59e9450
commit ce50841
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -3,10 +3,9 @@
 [![Unit Tests](https://github.com/sinoru/actions-setup-swift/actions/workflows/units.yml/badge.svg)](https://github.com/sinoru/actions-setup-swift/actions/workflows/test.yml)
 [![Tests](https://github.com/sinoru/actions-setup-swift/actions/workflows/tests.yml/badge.svg)](https://github.com/sinoru/actions-setup-swift/actions/workflows/test.yml)
 
-This action sets up a swift environment using [swiftenv](https://github.com/kylef/swiftenv) for use in actions by:
+This action sets up a swift environment for use in actions by:
 
-- optionally downloading a version of swift from swift.org.
-- supports macOS, Linux runner.
+- optionally downloading a version of swift from swift.org using [swiftenv](https://github.com/kylef/swiftenv).
 
 # Usage
 

diff --git a/action.yml b/action.yml
@@ -1,5 +1,5 @@
-name: 'Setup Swift (swiftenv)'
-description: 'Set up a specific version of swift using swiftenv'
+name: 'Setup Swift environment'
+description: 'Setup a Swift environment and optionally downloading and adding it to the PATH'
 branding:
   icon: 'feather'
   color: 'orange'

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/index.mjs b/index.mjs
@@ -27,12 +27,20 @@ async function installSwiftenv() {
   core.endGroup();
 }
 
+async function installSwift(options = {}) {
+  core.startGroup('Install swift');
+
+  await swiftenv.install(options);
+
+  core.endGroup();
+}
+
 async function setupSwift() {
   const swiftVersion = core.getInput('swift-version', { required: false });
 
   await installEssentials();
   await installSwiftenv();
-  await swiftenv.install({'swiftVersion': swiftVersion, 'debug': core.isDebug()});
+  await installSwift({'swiftVersion': swiftVersion, 'debug': core.isDebug()});
 }
 
 // most @actions toolkit packages have async methods

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "actions-setup-swift",
-  "version": "2.0.1",
-  "description": "Set up a specific version of swift using swiftenv",
+  "version": "2.0.2",
+  "description": "Setup a Swift environment and optionally downloading and adding it to the PATH",
   "main": "index.mjs",
   "scripts": {
     "lint": "eslint .",