Skip to content

build: add a workaround symlink for 5.3 builds #290

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 1 commit into from
Sep 16, 2020
Merged

build: add a workaround symlink for 5.3 builds #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions .ci/templates/windows-sdk.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ parameters:
- name: ICU_VERSION
type: string

- name: VERSION
type: string
default: 'master'

jobs:
- job: ${{ parameters.host }}
# NOTE(compnerd) disable non-x64 builds as they are currently broken :(
Expand Down Expand Up @@ -247,6 +251,10 @@ jobs:
-G Ninja
-S $(Build.SourcesDirectory)/swift

- ${{ if eq(parameters.VERSION,'5.3') }}:
- script: |
mklink "$(Build.BinariesDirectory)/swift-stdlib/bin/swiftc" "$(toolchain.directory)/usr/bin/swiftc.exe"

- task: CMake@1
displayName: Build Swift Standard Library
inputs:
Expand Down
8 changes: 8 additions & 0 deletions .ci/vs2019-swift-5.3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ stages:
ICU_VERSION: 67
SWIFT_OPTIONS: -DSWIFT_WINDOWS_armv7_ICU_UC_INCLUDE=$(icu.directory)/usr/include/unicode -DSWIFT_WINDOWS_armv7_ICU_UC=$(icu.directory)/usr/lib/icuuc$(icu.version).lib -DSWIFT_WINDOWS_armv7_ICU_I18N_INCLUDE=$(icu.directory)/usr/include -DSWIFT_WINDOWS_armv7_ICU_I18N=$(icu.directory)/usr/lib/icuin$(icu.version).lib -DPYTHON_EXECUTABLE=$(python.pythonLocation)/python.exe

VERSION: 5.3

- template: templates/windows-sdk.yml
parameters:
VisualStudio: 2019/Enterprise
Expand All @@ -197,6 +199,8 @@ stages:
ICU_VERSION: 67
SWIFT_OPTIONS: -DSWIFT_WINDOWS_aarch64_ICU_UC_INCLUDE=$(icu.directory)/usr/include/unicode -DSWIFT_WINDOWS_aarch64_ICU_UC=$(icu.directory)/usr/lib/icuuc$(icu.version).lib -DSWIFT_WINDOWS_aarch64_ICU_I18N_INCLUDE=$(icu.directory)/usr/include -DSWIFT_WINDOWS_aarch64_ICU_I18N=$(icu.directory)/usr/lib/icuin$(icu.version).lib -DPYTHON_EXECUTABLE=$(python.pythonLocation)/python.exe

VERSION: 5.3

- template: templates/windows-sdk.yml
parameters:
VisualStudio: 2019/Enterprise
Expand All @@ -214,6 +218,8 @@ stages:
ICU_VERSION: 67
SWIFT_OPTIONS: -DSWIFT_WINDOWS_x86_64_ICU_UC_INCLUDE=$(icu.directory)/usr/include/unicode -DSWIFT_WINDOWS_x86_64_ICU_UC=$(icu.directory)/usr/lib/icuuc$(icu.version).lib -DSWIFT_WINDOWS_x86_64_ICU_I18N_INCLUDE=$(icu.directory)/usr/include -DSWIFT_WINDOWS_x86_64_ICU_I18N=$(icu.directory)/usr/lib/icuin$(icu.version).lib -DPYTHON_EXECUTABLE=$(python.pythonLocation)/python.exe

VERSION: 5.3

- template: templates/windows-sdk.yml
parameters:
VisualStudio: 2019/Enterprise
Expand All @@ -231,6 +237,8 @@ stages:
ICU_VERSION: 67
SWIFT_OPTIONS: -DSWIFT_WINDOWS_i686_ICU_UC_INCLUDE=$(icu.directory)/usr/include/unicode -DSWIFT_WINDOWS_i686_ICU_UC=$(icu.directory)/usr/lib/icuuc$(icu.version).lib -DSWIFT_WINDOWS_i686_ICU_I18N_INCLUDE=$(icu.directory)/usr/include -DSWIFT_WINDOWS_i686_ICU_I18N=$(icu.directory)/usr/lib/icuin$(icu.version).lib -DPYTHON_EXECUTABLE=$(python.pythonLocation)/python.exe

VERSION: 5.3

- stage: package_toolchain
dependsOn: toolchain
displayName: package Toolchain
Expand Down