fix: fixed latest toolchain(> 5.6) setup failure on Windows

Author: soumyamahunt

.github/workflows/main.yml

@@ -113,19 +113,19 @@ jobs:
       cancel-in-progress: true
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, macos-13]
+        os: [ubuntu-latest, macos-latest, windows-latest]
         swift: ['latest']
         development: [false, true]
         include:
         - os: macos-latest
           swift: '5.0.0'
           development: false
+        - os: macos-13
+          swift: 'latest'
+          development: false
         - os: ubuntu-latest
           swift: '5.3.0'
           development: false
-        - os: windows-latest
-          swift: '5.6'
-          development: false
         - os: windows-latest
           swift: '5.3'
           development: false

README.md

@@ -1,6 +1,6 @@
 # Setup Swift
 
-[![GitHub Action](https://img.shields.io/github/v/tag/SwiftyLab/setup-swift?logo=github&label=GitHub)](https://badge.fury.io/gh/SwiftyLab%2Fsetup-swift)
+[![GitHub Action](https://img.shields.io/github/v/tag/SwiftyLab/setup-swift?logo=github&label=GitHub)](https://github.com/marketplace/actions/setup-swift-environment-for-macos-linux-and-windows)
 [![Supports macOS, Ubuntu & Windows](https://img.shields.io/badge/platform-macOS%20%7C%20Ubuntu%20%7C%20Windows-blue?label=platform)](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/virtual-environments-for-github-hosted-runners#supported-runners-and-hardware-resources)
 [![Swift 5.9](https://img.shields.io/badge/Swift-5.9-orange?logo=swift&logoColor=white)](https://swift.org)
 [![CI/CD](https://github.com/SwiftyLab/setup-swift/actions/workflows/main.yml/badge.svg)](https://github.com/SwiftyLab/setup-swift/actions/workflows/main.yml)
@@ -23,7 +23,8 @@ Or use the latest development snapshots by enabling the `development` flag:
 
 ```yml
 - uses: SwiftyLab/setup-swift@latest
-  development: true
+  with:
+    development: true
 ```
 
 After the environment is configured you can run swift and xcode commands using the standard [`run`](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#jobsjob_idstepsrun) step:

dist/index.js

@@ -45,6 +45,9 @@ export class WindowsToolchainInstaller extends VerifyingToolchainInstaller<Windo
   protected async unpack(exe: string) {
     core.debug(`Installing toolchain from "${exe}"`)
     const code = await exec(`"${exe}"`, ['-q'])
+    if (code !== 0) {
+      throw new Error(`Swift installer failed with exit code: "${code}"`)
+    }
     const installation = path.join(process.env.SystemDrive ?? 'C:', 'Library')
     const toolchain = path.join(
       installation,
@@ -61,11 +64,20 @@ export class WindowsToolchainInstaller extends VerifyingToolchainInstaller<Windo
       'SDKs',
       'Windows.sdk'
     )
-    if (code !== 0) {
-      throw new Error(`Swift installer failed with exit code: "${code}"`)
-    }
+    const runtime = path.join(
+      process.env.SystemDrive ?? 'C:',
+      'Program Files',
+      'swift'
+    )
     core.debug(`Toolchain installed at "${toolchain}"`)
     core.debug(`SDK installed at "${sdkroot}"`)
+    try {
+      await fs.access(runtime)
+      await fs.cp(runtime, path.join(installation, 'swift'), {recursive: true})
+      core.debug(`Runtime installed at "${runtime}"`)
+    } catch (error) {
+      core.debug('No Swift runtime installed')
+    }
     return installation
   }
 
@@ -90,7 +102,23 @@ export class WindowsToolchainInstaller extends VerifyingToolchainInstaller<Windo
     core.exportVariable('SDKROOT', sdkroot)
     const swiftDev = path.join(installation, 'Swift-development', 'bin')
     const icu67 = path.join(installation, 'icu-67', 'usr', 'bin')
-    for (const envPath of [swiftPath, swiftDev, icu67]) {
+    const runtime = path.join(
+      installation,
+      'swift',
+      'runtime-development',
+      'usr',
+      'bin'
+    )
+    const requirePaths = [swiftPath, swiftDev, icu67]
+    try {
+      await fs.access(runtime)
+      requirePaths.push(runtime)
+    } catch (error) {
+      core.debug('No Swift runtime found, skipping runtime path')
+    }
+
+    for (const envPath of requirePaths) {
+      core.debug(`Adding "${envPath}" to PATH`)
       core.addPath(envPath)
     }
     core.debug(`Swift installed at "${swiftPath}"`)