diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1db6dae..7c2f048 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -249,6 +249,9 @@ jobs: - os: windows-latest swift: '5.3' development: false + - os: windows-2019 + swift: '5.3' + development: false steps: - name: Checkout repository diff --git a/__tests__/installer/windows.test.ts b/__tests__/installer/windows.test.ts index b944eb3..1c0123f 100644 --- a/__tests__/installer/windows.test.ts +++ b/__tests__/installer/windows.test.ts @@ -1,10 +1,10 @@ -import * as os from 'os' import * as path from 'path' import {promises as fs} from 'fs' import * as core from '@actions/core' import * as exec from '@actions/exec' import * as cache from '@actions/cache' import * as toolCache from '@actions/tool-cache' +import os from 'os' import {coerce as parseSemVer} from 'semver' import {WindowsToolchainInstaller} from '../../src/installer/windows' import {VisualStudio} from '../../src/utils/visual_studio' @@ -23,15 +23,15 @@ describe('windows toolchain installation verification', () => { } const visualStudio = VisualStudio.createFromJSON({ installationPath: path.join('C:', 'Visual Studio'), - installationVersion: '16', - catalog: {productDisplayVersion: '16'}, + installationVersion: '17', + catalog: {productDisplayVersion: '17'}, properties: { setupEngineFilePath: path.join('C:', 'Visual Studio', 'setup.exe') } }) const vsEnvs = [ `UniversalCRTSdkDir=${path.join('C:', 'Windows Kits')}`, - `UCRTVersion=10.0.17063`, + `UCRTVersion=10.0.22000`, `VCToolsInstallDir=${path.join('C:', 'Visual Studio', 'Tools')}` ] @@ -58,6 +58,24 @@ describe('windows toolchain installation verification', () => { ]) }) + it('tests setting up on Windows 10', async () => { + jest.spyOn(os, 'release').mockReturnValue('10.0.17063') + const installer = new WindowsToolchainInstaller(toolchain) + expect(installer['vsRequirement'].components).toStrictEqual([ + 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64', + 'Microsoft.VisualStudio.Component.Windows10SDK.19041' + ]) + }) + + it('tests setting up on Windows 11', async () => { + jest.spyOn(os, 'release').mockReturnValue('10.0.22621') + const installer = new WindowsToolchainInstaller(toolchain) + expect(installer['vsRequirement'].components).toStrictEqual([ + 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64', + 'Microsoft.VisualStudio.Component.Windows11SDK.22621' + ]) + }) + it('tests download without caching', async () => { const installer = new WindowsToolchainInstaller(toolchain) expect(installer['version']).toStrictEqual(parseSemVer('5.8')) diff --git a/__tests__/utils/visual_studio/setup.test.ts b/__tests__/utils/visual_studio/setup.test.ts index 2ed7f32..555fbdd 100644 --- a/__tests__/utils/visual_studio/setup.test.ts +++ b/__tests__/utils/visual_studio/setup.test.ts @@ -7,8 +7,8 @@ describe('visual studio setup validation', () => { const env = process.env const visualStudio = VisualStudio.createFromJSON({ installationPath: path.join('C:', 'Visual Studio'), - installationVersion: '16', - catalog: {productDisplayVersion: '16'}, + installationVersion: '17', + catalog: {productDisplayVersion: '17'}, properties: { setupEngineFilePath: path.join('C:', 'Visual Studio', 'setup.exe') } diff --git a/dist/index.js b/dist/index.js index a4e5a2e..71aa44e 100644 --- a/dist/index.js +++ b/dist/index.js @@ -467,17 +467,20 @@ const utils_1 = __nccwpck_require__(1606); const installation_1 = __nccwpck_require__(539); class WindowsToolchainInstaller extends verify_1.VerifyingToolchainInstaller { get vsRequirement() { - const reccommended = '10.0.17763'; + const recommended = '10.0.19041'; const current = os.release(); - const version = semver.gte(current, reccommended) ? current : reccommended; - const winsdk = semver.patch(version); + const version = semver.gte(current, recommended) ? current : recommended; + const winsdkMajor = semver.lt(version, '10.0.22000') + ? semver.major(version) + : 11; + const winsdkMinor = semver.patch(version); const componentsStr = core.getInput('visual-studio-components'); const providedComponents = componentsStr ? componentsStr.split(';') : []; return { version: '16', components: [ 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64', - `Microsoft.VisualStudio.Component.Windows10SDK.${winsdk}`, + `Microsoft.VisualStudio.Component.Windows${winsdkMajor}SDK.${winsdkMinor}`, ...providedComponents ] }; @@ -521,11 +524,18 @@ class WindowsToolchainInstaller extends verify_1.VerifyingToolchainInstaller { const runtimePath = path.join(installation.runtime, 'usr', 'bin'); const requirePaths = [swiftPath, swiftDev, icu67, tools, runtimePath]; for (const envPath of requirePaths) { - core.debug(`Adding "${envPath}" to PATH`); - core.addPath(envPath); + try { + yield fs_1.promises.access(envPath); + core.debug(`Adding "${envPath}" to PATH`); + core.addPath(envPath); + } + catch (_a) { + core.debug(`"${envPath}" doesn't exist. Skip adding to PATH`); + } } core.debug(`Swift installed at "${swiftPath}"`); const visualStudio = yield utils_1.VisualStudio.setup(this.vsRequirement); + // FIXME(stevapple): This is no longer required for Swift 5.9+ yield visualStudio.update(installation.sdkroot); const swiftFlags = `-sdk %SDKROOT% -I %SDKROOT%/usr/lib/swift -L %SDKROOT%/usr/lib/swift/windows`; core.exportVariable('SWIFTFLAGS', swiftFlags); @@ -1580,7 +1590,7 @@ class Swiftorg { try { yield fs_1.promises.access(swiftorg); core.debug(`Removing existing "${swiftorg}" directory`); - yield fs_1.promises.rmdir(swiftorg, { recursive: true }); + yield fs_1.promises.rm(swiftorg, { recursive: true }); } catch (error) { core.debug(`Failed removing "${swiftorg}" with "${error}"`); @@ -1615,7 +1625,7 @@ class Swiftorg { gitArgs.push('--recursive', '--remote'); } core.debug(`Initializing submodules in "${const_1.MODULE_DIR}"`); - yield (0, exec_1.exec)('git', ['init'], { cwd: const_1.MODULE_DIR }); + yield (0, exec_1.exec)('git', ['init', '-b', 'main'], { cwd: const_1.MODULE_DIR }); core.debug(`Updating submodules in "${const_1.MODULE_DIR}" with args "${gitArgs}"`); yield (0, exec_1.exec)('git', gitArgs, { cwd: const_1.MODULE_DIR }); const swiftorg = path.join(const_1.MODULE_DIR, 'swiftorg'); diff --git a/src/installer/windows/index.ts b/src/installer/windows/index.ts index c14eb39..609ccdd 100644 --- a/src/installer/windows/index.ts +++ b/src/installer/windows/index.ts @@ -11,17 +11,20 @@ import {Installation} from './installation' export class WindowsToolchainInstaller extends VerifyingToolchainInstaller { private get vsRequirement() { - const reccommended = '10.0.17763' + const recommended = '10.0.19041' const current = os.release() - const version = semver.gte(current, reccommended) ? current : reccommended - const winsdk = semver.patch(version) + const version = semver.gte(current, recommended) ? current : recommended + const winsdkMajor = semver.lt(version, '10.0.22000') + ? semver.major(version) + : 11 + const winsdkMinor = semver.patch(version) const componentsStr = core.getInput('visual-studio-components') const providedComponents = componentsStr ? componentsStr.split(';') : [] return { version: '16', components: [ 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64', - `Microsoft.VisualStudio.Component.Windows10SDK.${winsdk}`, + `Microsoft.VisualStudio.Component.Windows${winsdkMajor}SDK.${winsdkMinor}`, ...providedComponents ] } @@ -71,6 +74,7 @@ export class WindowsToolchainInstaller extends VerifyingToolchainInstaller