Merge branch 'release/2.0.3'

sinoru · Aug 3, 2021 · 4c0efd7 · 4c0efd7
2 parents 8f5efaa + 68f3a54
commit 4c0efd7
Show file tree

Hide file tree

Showing 7 changed files with 8,177 additions and 1,563 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -17,8 +17,8 @@ jobs:
     runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:
-        operating-system: ["ubuntu-16.04", "ubuntu-18.04", "ubuntu-20.04", "macos-10.15"]
-        swift-version: ["5.0.3", "5.1.5", "5.2.5", "5.3.3"]
+        operating-system: ["ubuntu-18.04", "ubuntu-20.04", "macos-10.15"]
+        swift-version: ["5.0.3", "5.1.5", "5.2.5", "5.3.3", "5.4.2"]
         exclude:
           - operating-system: "ubuntu-20.04"
             swift-version: "5.0.3"
@@ -29,4 +29,7 @@ jobs:
       - uses: ./
         with:
           swift-version: ${{ matrix.swift-version }}
+      - run: echo $PATH
+      - run: which swift
+      - run: swiftenv which swift
       - run: swift -version
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/dist/licenses.txt b/dist/licenses.txt
diff --git a/index.mjs b/index.mjs
@@ -18,11 +18,13 @@ async function installEssentials() {
 async function installSwiftenv() {
   core.startGroup('Install swiftlint');
 
-  await exec.exec('git clone --depth 1 https://github.com/kylef/swiftenv.git ~/.swiftenv');
+  const swiftenvRoot = process.env.HOME + '/.swiftenv'
 
-  core.exportVariable('SWIFTENV_ROOT', '~/.swiftenv');
-  core.addPath('~/.swiftenv/bin');
-  core.addPath('~/.swiftenv/shims');
+  await exec.exec('git clone --depth 1 https://github.com/kylef/swiftenv.git ' + swiftenvRoot);
+
+  core.exportVariable('SWIFTENV_ROOT', process.env.HOME + '/.swiftenv');
+  core.addPath(swiftenvRoot + '/bin');
+  core.addPath(swiftenvRoot + '/shims');
 
   core.endGroup();
 }
@@ -38,6 +40,10 @@ async function installSwift(options = {}) {
 async function setupSwift() {
   const swiftVersion = core.getInput('swift-version', { required: false });
 
+  if (swiftVersion) {
+    core.exportVariable('SWIFT_VERSION', swiftVersion)
+  }
+
   await installEssentials();
   await installSwiftenv();
   await installSwift({'swiftVersion': swiftVersion, 'debug': core.isDebug()});