diff --git a/.github/changelog/pre_changelog_hook.cjs b/.github/changelog/pre_changelog_hook.cjs index 9c197ac..4b21ad1 100644 --- a/.github/changelog/pre_changelog_hook.cjs +++ b/.github/changelog/pre_changelog_hook.cjs @@ -1,15 +1,14 @@ 'use strict' const semver = require('semver') -const core = require('@actions/core') exports.preVersionGeneration = version => { const {VERSION} = process.env - core.info(`Computed version bump: ${version}`) + console.log(`Computed version bump: ${version}`) const newVersion = semver.valid(VERSION) if (newVersion) { version = newVersion - core.info(`Using provided version: ${version}`) + console.log(`Using provided version: ${version}`) } return version } diff --git a/dist/index.js b/dist/index.js index 76213fa..4ec667a 100644 --- a/dist/index.js +++ b/dist/index.js @@ -88588,7 +88588,7 @@ var WindowsToolchainInstaller = class extends VerifyingToolchainInstaller { }; } async download(arch5) { - let vsSetupAction = new Promise((resolve2) => resolve2({})); + let vsSetupAction = Promise.resolve({}); const vsComponents = getInput(INPUT_VISUAL_STUDIO_COMPONENTS); if (vsComponents.length || getBooleanInput(INPUT_PREFER_VISUAL_STUDIO_LINKER)) { debug(`Using VS requirement ${JSON.stringify(this.vsRequirement(arch5))}`); @@ -88641,7 +88641,7 @@ var WindowsToolchainInstaller = class extends VerifyingToolchainInstaller { sdkroot = installation.variables[sdkrootKey]; } if (!sdkroot) { - warning(`Failed VS environment after installation ${installLocation}`); + warning(`SDKROOT was not set after installation at ${installLocation}; Visual Studio/Swift environment setup cannot continue and the installation may be unusable.`); return; } const version3 = await this.installedSwiftVersion(); diff --git a/src/installer/windows/index.ts b/src/installer/windows/index.ts index cd72eee..0940ccc 100644 --- a/src/installer/windows/index.ts +++ b/src/installer/windows/index.ts @@ -87,7 +87,7 @@ export class WindowsToolchainInstaller extends VerifyingToolchainInstaller resolve({})) + let vsSetupAction = Promise.resolve({}) const vsComponents = core.getInput(INPUT_VISUAL_STUDIO_COMPONENTS) if ( vsComponents.length || @@ -153,7 +153,7 @@ export class WindowsToolchainInstaller extends VerifyingToolchainInstaller