Skip to content

Commit 70b8a2d

Browse files
Steelskincompnerd
authored andcommitted
build: Add swift-buprocess to the build
1 parent 2c8785c commit 70b8a2d

File tree

1 file changed

+39
-0
lines changed

1 file changed

+39
-0
lines changed

.github/workflows/swift-toolchain.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3743,6 +3743,12 @@ jobs:
37433743
ref: ${{ inputs.swift_system_revision }}
37443744
path: ${{ github.workspace }}/SourceCache/swift-system
37453745
show-progress: false
3746+
- uses: actions/[email protected]
3747+
with:
3748+
repository: swiftlang/swift-subprocess
3749+
ref: ${{ inputs.swift_subprocess_revision }}
3750+
path: ${{ github.workspace }}/SourceCache/swift-subprocess
3751+
show-progress: false
37463752
- uses: actions/[email protected]
37473753
with:
37483754
repository: swiftlang/swift-tools-support-core
@@ -3970,6 +3976,37 @@ jobs:
39703976
- name: Build swift-system
39713977
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-system
39723978

3979+
- name: Configure swift-subprocess
3980+
run: |
3981+
# Workaround CMake 3.20 issue
3982+
$CLANG_CL = cygpath -m ${{ github.workspace }}/BinaryCache/Library/Developer/Toolchains/${{ inputs.swift_version }}+Asserts/usr/bin/clang-cl.exe
3983+
$SWIFTC = cygpath -m ${{ github.workspace }}/BinaryCache/Library/Developer/Toolchains/${{ inputs.swift_version }}+Asserts/usr/bin/swiftc.exe
3984+
3985+
cmake -B ${{ github.workspace }}/BinaryCache/swift-subprocess `
3986+
-D BUILD_SHARED_LIBS=NO `
3987+
-D BUILD_TESTING=NO `
3988+
-D CMAKE_BUILD_TYPE=Release `
3989+
-D CMAKE_C_COMPILER=${CLANG_CL} `
3990+
-D CMAKE_C_COMPILER_TARGET=${{ matrix.triple }} `
3991+
-D CMAKE_C_FLAGS="${{ inputs.WINDOWS_CMAKE_C_FLAGS }}" `
3992+
-D CMAKE_CXX_COMPILER=${CLANG_CL} `
3993+
-D CMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} `
3994+
-D CMAKE_CXX_FLAGS="${{ inputs.WINDOWS_CMAKE_CXX_FLAGS }}" `
3995+
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/${{ inputs.swift_version }}+Asserts/usr `
3996+
-D CMAKE_Swift_COMPILER=${SWIFTC} `
3997+
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple }} `
3998+
-D CMAKE_Swift_COMPILER_WORKS=YES `
3999+
-D CMAKE_Swift_FLAGS="-sdk ${env:SDKROOT} ${{ inputs.CMAKE_Swift_FLAGS }}" `
4000+
-D CMAKE_Swift_FLAGS_RELEASE="-O" `
4001+
-D CMAKE_STATIC_LIBRARY_PREFIX_Swift="lib" `
4002+
${{ matrix.cmake_linker_flags }} `
4003+
-D CMAKE_SYSTEM_NAME=Windows `
4004+
-D CMAKE_SYSTEM_PROCESSOR=${{ matrix.cpu }} `
4005+
-G Ninja `
4006+
-S ${{ github.workspace }}/SourceCache/swift-subprocess
4007+
- name: Build swift-subprocess
4008+
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-subprocess
4009+
39734010
- name: Configure swift-tools-support-core
39744011
run: |
39754012
# Workaround CMake 3.20 issue
@@ -4331,6 +4368,8 @@ jobs:
43314368
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-driver --target install
43324369
- name: Install swift-build
43334370
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-build --target install
4371+
- name: Install swift-subprocess
4372+
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-subprocess --target install
43344373
- name: Install swift-package-manager
43354374
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-package-manager --target install
43364375
- name: Install SourceKit-LSP

0 commit comments

Comments
 (0)