|
179 | 179 | required: true |
180 | 180 | type: string |
181 | 181 |
|
| 182 | + swift_tools_protocols_revision: |
| 183 | + required: true |
| 184 | + type: string |
| 185 | + |
182 | 186 | swift_tools_support_core_revision: |
183 | 187 | required: true |
184 | 188 | type: string |
@@ -3319,6 +3323,11 @@ jobs: |
3319 | 3323 | ref: ${{ inputs.swift_markdown_revision }} |
3320 | 3324 | path: ${{ github.workspace }}/SourceCache/swift-markdown |
3321 | 3325 | show-progress: false |
| 3326 | + |
| 3327 | + with: |
| 3328 | + repository: swiftlang/swift-tools-protocols |
| 3329 | + ref: ${{ inputs.swift_tools_protocols_revision }} |
| 3330 | + path: ${{ github.workspace }}/SourceCache/swift-tools-protocols |
3322 | 3331 | |
3323 | 3332 | with: |
3324 | 3333 | repository: swiftlang/swift-build |
@@ -3642,6 +3651,30 @@ jobs: |
3642 | 3651 | - name: Build swift-certificates |
3643 | 3652 | run: cmake --build ${{ github.workspace }}/BinaryCache/swift-certificates |
3644 | 3653 |
|
| 3654 | + - name: Configure swift-tools-protocols |
| 3655 | + uses: ./SourceCache/ci-build/.github/actions/configure-cmake-project |
| 3656 | + with: |
| 3657 | + project-name: swift-tools-protocols |
| 3658 | + swift-version: ${{ inputs.swift_version }} |
| 3659 | + enable-caching: true |
| 3660 | + debug-info: ${{ inputs.debug_info }} |
| 3661 | + build-os: ${{ inputs.build_os }} |
| 3662 | + build-arch: ${{ inputs.build_arch }} |
| 3663 | + os: ${{ matrix.os }} |
| 3664 | + arch: ${{ matrix.arch }} |
| 3665 | + src-dir: ${{ github.workspace }}/SourceCache/swift-tools-protocols |
| 3666 | + bin-dir: ${{ github.workspace }}/BinaryCache/swift-tools-protocols |
| 3667 | + install-dir: ${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/${{ inputs.swift_version }}+Asserts/usr |
| 3668 | + swift-sdk-path: ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/${{ matrix.os }}.platform/Developer/SDKs/${{ matrix.os }}.sdk |
| 3669 | + built-compilers: '@("C", "CXX", "Swift")' |
| 3670 | + cmake-defines: | |
| 3671 | + @{ |
| 3672 | + 'BUILD_SHARED_LIBS' = "YES"; |
| 3673 | + 'CMAKE_STATIC_LIBRARY_PREFIX_Swift' = "lib"; |
| 3674 | + } |
| 3675 | + - name: Build swift-tools-protocols |
| 3676 | + run: cmake --build ${{ github.workspace }}/BinaryCache/swift-tools-protocols |
| 3677 | + |
3645 | 3678 | - name: Configure swift-build |
3646 | 3679 | uses: ./SourceCache/ci-build/.github/actions/configure-cmake-project |
3647 | 3680 | with: |
@@ -3670,6 +3703,7 @@ jobs: |
3670 | 3703 | 'SQLite3_INCLUDE_DIR' = "${{ github.workspace }}/BinaryCache/Library/sqlite-${{ inputs.swift_toolchain_sqlite_version }}/usr/include"; |
3671 | 3704 | 'SQLite3_LIBRARY' = "${{ github.workspace }}/BinaryCache/Library/sqlite-${{ inputs.swift_toolchain_sqlite_version }}/usr/lib/SQLite3.lib"; |
3672 | 3705 | 'CMAKE_Swift_FLAGS' = "${{ matrix.arch == 'arm64' && '-use-ld=lld-link' || '' }}"; |
| 3706 | + 'SwiftToolsProtocols_DIR' = "${{ github.workspace }}/BinaryCache/swift-tools-protocols/cmake/modules"; |
3673 | 3707 | } |
3674 | 3708 | - name: Build swift-build |
3675 | 3709 | run: cmake --build ${{ github.workspace }}/BinaryCache/swift-build |
@@ -3714,6 +3748,7 @@ jobs: |
3714 | 3748 | 'SwiftSyntax_DIR' = "${{ github.workspace }}/BinaryCache/swift-syntax/cmake/modules" |
3715 | 3749 | 'SQLite3_INCLUDE_DIR' = "${{ github.workspace }}/BinaryCache/Library/sqlite-${{ inputs.swift_toolchain_sqlite_version }}/usr/include"; |
3716 | 3750 | 'SQLite3_LIBRARY' = "${{ github.workspace }}/BinaryCache/Library/sqlite-${{ inputs.swift_toolchain_sqlite_version }}/usr/lib/SQLite3.lib"; |
| 3751 | + 'SwiftToolsProtocols_DIR' = "${{ github.workspace }}/BinaryCache/swift-tools-protocols/cmake/modules"; |
3717 | 3752 | } |
3718 | 3753 | - name: Build swift-package-manager |
3719 | 3754 | run: cmake --build ${{ github.workspace }}/BinaryCache/swift-package-manager |
@@ -3873,6 +3908,8 @@ jobs: |
3873 | 3908 | run: cmake --build ${{ github.workspace }}/BinaryCache/swift-tools-support-core --target install |
3874 | 3909 | - name: Install swift-driver |
3875 | 3910 | run: cmake --build ${{ github.workspace }}/BinaryCache/swift-driver --target install |
| 3911 | + - name: Install swift-tools-protocols |
| 3912 | + run: cmake --build ${{ github.workspace }}/BinaryCache/swift-tools-protocols --target install |
3876 | 3913 | - name: Install swift-build |
3877 | 3914 | run: cmake --build ${{ github.workspace }}/BinaryCache/swift-build --target install |
3878 | 3915 | - name: Install swift-subprocess |
|
0 commit comments