Skip to content

Create vfs-overlay.yaml on demand #931

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 3 commits into from
Apr 3, 2025
Merged

Create vfs-overlay.yaml on demand #931

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dcf1eca
Parameterize the vfs-overlay paths
Steelskin Apr 2, 2025
3a0e02b
Create vfs-overlay.yaml
Steelskin Apr 2, 2025
6ad9abf
Use uppercase parameter
Steelskin Apr 3, 2025
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
107 changes: 91 additions & 16 deletions .github/workflows/swift-toolchain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1889,12 +1889,6 @@ jobs:
name: ${{ matrix.os }}-${{ matrix.arch }}-stdlib
path: ${{ github.workspace }}/BuildRoot/Library

- uses: actions/upload-artifact@v4
if: matrix.os == 'Windows'
with:
name: ${{ matrix.os }}-${{ matrix.arch }}-vfs-overlay
path: ${{ github.workspace }}/BinaryCache/swift/stdlib/windows-vfs-overlay.yaml

- name: Upload PDBs to Azure
uses: microsoft/[email protected]
if: ${{ inputs.debug_info && matrix.os == 'Windows' }}
Expand Down Expand Up @@ -1945,10 +1939,6 @@ jobs:
with:
name: Windows-${{ inputs.build_arch }}-stdlib
path: ${{ github.workspace }}/BinaryCache/Library
- uses: actions/download-artifact@v4
with:
name: Windows-${{ matrix.arch }}-vfs-overlay
path: ${{ github.workspace }}/BinaryCache/swift/stdlib
- uses: actions/[email protected]
with:
repository: swiftlang/swift
Expand Down Expand Up @@ -1980,12 +1970,56 @@ jobs:
$RTLPath = cygpath -w ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/bin
echo ${RTLPath} | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append

- name: extract swift-syntax
- name: Extract swift-syntax
run: |
$module = "${{ github.workspace }}/BinaryCache/swift-syntax/cmake/modules/SwiftSyntaxConfig.cmake"
$bindir = cygpath -m ${{ github.workspace }}/BinaryCache/swift-syntax
(Get-Content $module).Replace('<BINARY_DIR>', "${bindir}") | Set-Content $module

- name: Create vfs-overlay
run: |
$VfsOverlay = "${{ github.workspace }}/BinaryCache/swift/stdlib/windows-vfs-overlay.yaml"
$ModuleMapDir = cygpath -m ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/share
$Win10SdkRoot = Get-ItemPropertyValue `
-Path "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots" `
-Name "KitsRoot10"
$Win10SdkRoot = cygpath -m ${Win10SdkRoot}
$InstallerLocation = Join-Path "${env:ProgramFiles(x86)}" "Microsoft Visual Studio" "Installer"
$VsWhere = Join-Path "${InstallerLocation}" "vswhere.exe"
$VsInstallPath = (& "$VsWhere" -latest -products * -format json | ConvertFrom-Json).installationPath
$VsInstallPath = cygpath -m ${VsInstallPath}

$ModuleMap = @"
version: 0
use-external-names: false
case-sensitive: false
roots:
- name: "${Win10SdkRoot}/Include/${env:WORKAROUND_WINDOWS_SDK_VERSION}/um"
type: directory
contents:
- name: module.modulemap
type: file
external-contents: "${ModuleMapDir}/winsdk.modulemap"
- name: "${Win10SdkRoot}/Include/${env:WORKAROUND_WINDOWS_SDK_VERSION}/ucrt"
type: directory
contents:
- name: module.modulemap
type: file
external-contents: "${ModuleMapDir}/ucrt.modulemap"
- name: "${VsInstallPath}/VC/Tools/MSVC/${env:WORKAROUND_WINDOWS_COMPILER_VERSION}/include"
type: directory
contents:
- name: module.modulemap
type: file
external-contents: "${ModuleMapDir}/vcruntime.modulemap"
- name: vcruntime.apinotes
type: file
external-contents: "${ModuleMapDir}/vcruntime.apinotes"
"@
$VfsOverlayDir = Split-Path -Parent $VfsOverlay
New-Item -ItemType Directory -Path $VfsOverlayDir
Write-Output $ModuleMap | Out-File -FilePath $VfsOverlay -Encoding utf8

- name: Configure Foundation Macros
run: |
$WINDOWS_VFS_OVERLAY = cygpath -m ${{ github.workspace }}/BinaryCache/swift/stdlib/windows-vfs-overlay.yaml
Expand Down Expand Up @@ -2190,11 +2224,6 @@ jobs:
with:
name: Windows-${{ inputs.build_arch }}-stdlib
path: ${{ github.workspace }}/BinaryCache/Library
- uses: actions/download-artifact@v4
if: matrix.os == 'Windows'
with:
name: Windows-${{ matrix.arch }}-vfs-overlay
path: ${{ github.workspace }}/BinaryCache/swift/stdlib
- uses: actions/download-artifact@v4
if: matrix.os != 'Android' || inputs.build_android
with:
Expand Down Expand Up @@ -2309,6 +2338,52 @@ jobs:
with:
ndk-version: ${{ inputs.ANDROID_NDK_VERSION }}

- name: Create vfs-overlay
if: matrix.os == 'Windows'
run: |
$VfsOverlay = "${{ github.workspace }}/BinaryCache/swift/stdlib/windows-vfs-overlay.yaml"
$ModuleMapDir = cygpath -m ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/share
$Win10SdkRoot = Get-ItemPropertyValue `
-Path "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots" `
-Name "KitsRoot10"
$Win10SdkRoot = cygpath -m ${Win10SdkRoot}
$InstallerLocation = Join-Path "${env:ProgramFiles(x86)}" "Microsoft Visual Studio" "Installer"
$VsWhere = Join-Path "${InstallerLocation}" "vswhere.exe"
$VsInstallPath = (& "$VsWhere" -latest -products * -format json | ConvertFrom-Json).installationPath
$VsInstallPath = cygpath -m ${VsInstallPath}

$ModuleMap = @"
version: 0
use-external-names: false
case-sensitive: false
roots:
- name: "${Win10SdkRoot}/Include/${env:WORKAROUND_WINDOWS_SDK_VERSION}/um"
type: directory
contents:
- name: module.modulemap
type: file
external-contents: "${ModuleMapDir}/winsdk.modulemap"
- name: "${Win10SdkRoot}/Include/${env:WORKAROUND_WINDOWS_SDK_VERSION}/ucrt"
type: directory
contents:
- name: module.modulemap
type: file
external-contents: "${ModuleMapDir}/ucrt.modulemap"
- name: "${VsInstallPath}/VC/Tools/MSVC/${env:WORKAROUND_WINDOWS_COMPILER_VERSION}/include"
type: directory
contents:
- name: module.modulemap
type: file
external-contents: "${ModuleMapDir}/vcruntime.modulemap"
- name: vcruntime.apinotes
type: file
external-contents: "${ModuleMapDir}/vcruntime.apinotes"
"@

$VfsOverlayDir = Split-Path -Parent $VfsOverlay
New-Item -ItemType Directory -Path $VfsOverlayDir
Write-Output $ModuleMap | Out-File -FilePath $VfsOverlay -Encoding utf8

- name: Configure libdispatch
if: matrix.os != 'Android' || inputs.build_android
run: |
Expand Down