Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .github/workflows/build-toolchain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ jobs:
swift_testing_revision: ${{ steps.context.outputs.swift_testing_revision }}
swift_toolchain_sqlite_revision: ${{ steps.context.outputs.swift_toolchain_sqlite_revision }}
swift_toolchain_sqlite_version: ${{ steps.context.outputs.swift_toolchain_sqlite_version }}
swift_tools_protocols_revision: ${{ steps.context.outputs.swift_tools_protocols_revision }}
swift_tools_support_core_revision: ${{ steps.context.outputs.swift_tools_support_core_revision }}
zlib_revision: ${{ steps.context.outputs.zlib_revision }}
zlib_version: ${{ steps.context.outputs.zlib_version }}
Expand Down Expand Up @@ -292,6 +293,7 @@ jobs:
swift_system_revision=refs/tags/1.3.0
swift_testing_revision=refs/heads/main
swift_toolchain_sqlite_revision=refs/tags/1.0.1
swift_tools_protocols_revision=refs/tags/0.0.2
swift_tools_support_core_revision=refs/tags/${{ inputs.swift_tag }}
curl_revision=refs/tags/curl-8_9_1
ds2_revision=refs/tags/nightly-2024-11-07
Expand Down Expand Up @@ -623,6 +625,7 @@ jobs:
swift_testing_revision: ${{ needs.context.outputs.swift_testing_revision }}
swift_toolchain_sqlite_revision: ${{ needs.context.outputs.swift_toolchain_sqlite_revision }}
swift_toolchain_sqlite_version: ${{ needs.context.outputs.swift_toolchain_sqlite_version }}
swift_tools_protocols_revision: ${{ needs.context.outputs.swift_tools_protocols_revision }}
swift_tools_support_core_revision: ${{ needs.context.outputs.swift_tools_support_core_revision }}
zlib_revision: ${{ needs.context.outputs.zlib_revision }}
zlib_version: ${{ needs.context.outputs.zlib_version }}
Expand Down Expand Up @@ -709,6 +712,7 @@ jobs:
swift_testing_revision: ${{ needs.context.outputs.swift_testing_revision }}
swift_toolchain_sqlite_revision: ${{ needs.context.outputs.swift_toolchain_sqlite_revision }}
swift_toolchain_sqlite_version: ${{ needs.context.outputs.swift_toolchain_sqlite_version }}
swift_tools_protocols_revision: ${{ needs.context.outputs.swift_tools_protocols_revision }}
swift_tools_support_core_revision: ${{ needs.context.outputs.swift_tools_support_core_revision }}
zlib_revision: ${{ needs.context.outputs.zlib_revision }}
zlib_version: ${{ needs.context.outputs.zlib_version }}
Expand Down
38 changes: 38 additions & 0 deletions .github/workflows/swift-toolchain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,10 @@ on:
required: true
type: string

swift_tools_protocols_revision:
required: true
type: string

swift_tools_support_core_revision:
required: true
type: string
Expand Down Expand Up @@ -3319,6 +3323,12 @@ jobs:
ref: ${{ inputs.swift_markdown_revision }}
path: ${{ github.workspace }}/SourceCache/swift-markdown
show-progress: false
- uses: actions/checkout@v4.2.2
with:
repository: swiftlang/swift-tools-protocols
ref: ${{ inputs.swift_tools_protocols_revision }}
path: ${{ github.workspace }}/SourceCache/swift-tools-protocols
show-progress: false
- uses: actions/checkout@v4.2.2
with:
repository: swiftlang/swift-build
Expand Down Expand Up @@ -3642,6 +3652,30 @@ jobs:
- name: Build swift-certificates
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-certificates

- name: Configure swift-tools-protocols
uses: ./SourceCache/ci-build/.github/actions/configure-cmake-project
with:
project-name: swift-tools-protocols
swift-version: ${{ inputs.swift_version }}
enable-caching: true
debug-info: ${{ inputs.debug_info }}
build-os: ${{ inputs.build_os }}
build-arch: ${{ inputs.build_arch }}
os: ${{ matrix.os }}
arch: ${{ matrix.arch }}
src-dir: ${{ github.workspace }}/SourceCache/swift-tools-protocols
bin-dir: ${{ github.workspace }}/BinaryCache/swift-tools-protocols
install-dir: ${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/${{ inputs.swift_version }}+Asserts/usr
swift-sdk-path: ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/${{ matrix.os }}.platform/Developer/SDKs/${{ matrix.os }}.sdk
built-compilers: '@("C", "CXX", "Swift")'
cmake-defines: |
@{
'BUILD_SHARED_LIBS' = "YES";
'CMAKE_STATIC_LIBRARY_PREFIX_Swift' = "lib";
}
- name: Build swift-tools-protocols
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-tools-protocols

- name: Configure swift-build
uses: ./SourceCache/ci-build/.github/actions/configure-cmake-project
with:
Expand Down Expand Up @@ -3670,6 +3704,7 @@ jobs:
'SQLite3_INCLUDE_DIR' = "${{ github.workspace }}/BinaryCache/Library/sqlite-${{ inputs.swift_toolchain_sqlite_version }}/usr/include";
'SQLite3_LIBRARY' = "${{ github.workspace }}/BinaryCache/Library/sqlite-${{ inputs.swift_toolchain_sqlite_version }}/usr/lib/SQLite3.lib";
'CMAKE_Swift_FLAGS' = "${{ matrix.arch == 'arm64' && '-use-ld=lld-link' || '' }}";
'SwiftToolsProtocols_DIR' = "${{ github.workspace }}/BinaryCache/swift-tools-protocols/cmake/modules";
}
- name: Build swift-build
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-build
Expand Down Expand Up @@ -3714,6 +3749,7 @@ jobs:
'SwiftSyntax_DIR' = "${{ github.workspace }}/BinaryCache/swift-syntax/cmake/modules"
'SQLite3_INCLUDE_DIR' = "${{ github.workspace }}/BinaryCache/Library/sqlite-${{ inputs.swift_toolchain_sqlite_version }}/usr/include";
'SQLite3_LIBRARY' = "${{ github.workspace }}/BinaryCache/Library/sqlite-${{ inputs.swift_toolchain_sqlite_version }}/usr/lib/SQLite3.lib";
'SwiftToolsProtocols_DIR' = "${{ github.workspace }}/BinaryCache/swift-tools-protocols/cmake/modules";
}
- name: Build swift-package-manager
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-package-manager
Expand Down Expand Up @@ -3873,6 +3909,8 @@ jobs:
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-tools-support-core --target install
- name: Install swift-driver
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-driver --target install
- name: Install swift-tools-protocols
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-tools-protocols --target install
- name: Install swift-build
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-build --target install
- name: Install swift-subprocess
Expand Down