Skip to content

feat: expand SWIFTFLAGS with full paths #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 15, 2024
Merged

feat: expand SWIFTFLAGS with full paths #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
781268b
feat: expand SWIFTFLAGS with full paths
stevapple Sep 26, 2023
c371ddb
test: assert SWIFTFLAGS on Windows
stevapple Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions __tests__/installer/windows.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ describe('windows toolchain installation verification', () => {
'SDKs',
'Windows.sdk'
)
const swiftLibs = path.join(sdkroot, 'usr', 'lib', 'swift')
const swiftPath = path.join(toolPath, 'usr', 'bin')
const swiftDev = path.join(installation, 'Swift-development', 'bin')
const icu67 = path.join(installation, 'icu-67', 'usr', 'bin')
Expand All @@ -192,6 +193,11 @@ describe('windows toolchain installation verification', () => {
expect(process.env.PATH?.includes(swiftDev)).toBeTruthy()
expect(process.env.PATH?.includes(icu67)).toBeTruthy()
expect(process.env.SDKROOT).toBe(sdkroot)
expect(process.env.SWIFTFLAGS).toContain(`-sdk ${sdkroot}`)
expect(process.env.SWIFTFLAGS).toContain(`-I ${swiftLibs}`)
expect(process.env.SWIFTFLAGS).toContain(
`-L ${path.join(swiftLibs, 'windows')}`
)
})

it('tests installation with cache', async () => {
Expand Down
14 changes: 11 additions & 3 deletions dist/index.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 11 additions & 3 deletions src/installer/windows/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ export class WindowsToolchainInstaller extends VerifyingToolchainInstaller<Windo
if (!installation) {
return
}
core.exportVariable('SDKROOT', installation.sdkroot)
const sdkroot = installation.sdkroot
core.exportVariable('SDKROOT', sdkroot)
if (installation.devdir) {
core.exportVariable('DEVELOPER_DIR', installation.devdir)
}
Expand All @@ -71,8 +72,15 @@ export class WindowsToolchainInstaller extends VerifyingToolchainInstaller<Windo
}
core.debug(`Swift installed at "${swiftPath}"`)
const visualStudio = await VisualStudio.setup(this.vsRequirement)
await visualStudio.update(installation.sdkroot)
const swiftFlags = `-sdk %SDKROOT% -I %SDKROOT%/usr/lib/swift -L %SDKROOT%/usr/lib/swift/windows`
await visualStudio.update(sdkroot)
const swiftFlags = [
'-sdk',
sdkroot,
'-I',
path.join(sdkroot, 'usr', 'lib', 'swift'),
'-L',
path.join(sdkroot, 'usr', 'lib', 'swift', 'windows')
].join(' ')
core.exportVariable('SWIFTFLAGS', swiftFlags)
}
}
Loading