fix: fixed older Swift toolchain installations on Windows (#307)

* chore: test older Swift release installation support on Windows * fix: fixed older Swift toolchain installations * chore: added more logs
SwiftyLab · Sep 15, 2024 · 420581b · 420581b
1 parent 6973bb8
commit 420581b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -162,6 +162,9 @@ jobs:
  - os: macos-13
  swift: 'latest'
  development: false
+ - os: windows-latest
+ swift: '5.9'
+ development: false
  - os: ubuntu-latest
  swift: '5.3.0'
  development: false

diff --git a/src/installer/windows/installation/approach.ts b/src/installer/windows/installation/approach.ts
@@ -13,13 +13,21 @@ export async function firstDirectoryLayout(root?: string) {
  await fs.access(toolchain)
  const winsdk = path.join('Developer', 'SDKs', 'Windows.sdk')
  const sdkroot = path.join(devdir, 'Platforms', 'Windows.platform', winsdk)
- const runtime = path.join(location, 'Swift', 'runtime-development')
+ const runtimeRoot = path.join(location, 'Swift')
+ const runtime = path.join(runtimeRoot, 'runtime-development')
+ const devPath = path.join(systemDrive, 'Program Files', 'Swift')
+ try {
+ await fs.access(devPath)
+ await fs.cp(devPath, runtimeRoot, {recursive: true})
+ } catch (error) {
+ core.debug(`Runtime check failed with "${error}"`)
+ }
  core.debug('First installation approach succeeded')
  return new Installation(location, toolchain, sdkroot, runtime, devdir)
 }
 
 export async function secondDirectoryLayout(root?: string) {
- core.debug('Trying secong installation approach')
+ core.debug('Trying second installation approach')
  const systemDrive = root ?? process.env.SystemDrive ?? 'C:'
  const location = path.join(systemDrive, 'Program Files', 'Swift')
  const toolchainName = '0.0.0+Asserts'
@@ -28,9 +36,6 @@ export async function secondDirectoryLayout(root?: string) {
  const winsdk = path.join('Developer', 'SDKs', 'Windows.sdk')
  const sdkroot = path.join(location, 'Platforms', 'Windows.platform', winsdk)
  const runtime = path.join(location, 'Runtimes', '0.0.0')
- const runtimeRoot = path.join(location, 'Swift')
- const devPath = path.join(systemDrive, 'Program Files', 'Swift')
- await fs.cp(devPath, runtimeRoot, {recursive: true})
  core.debug('Second installation approach succeeded')
  return new Installation(location, toolchain, sdkroot, runtime)
 }
diff --git a/src/installer/windows/installation/index.ts b/src/installer/windows/installation/index.ts
@@ -36,7 +36,7 @@ Installation.get = async (install?: string) => {
  core.debug(`Development directory at "${installation.devdir}"`)
  return installation
  } catch (error) {
- core.debug(`Failed ${counter} time(s)`)
+ core.debug(`Failed ${counter} time(s), recent error "${error}"`)
  }
  }
  return undefined