Skip to content

Commit e416cb3

Browse files
committed
GHA: add swift-build to the build
Prepare to build swift-build in the toolchain build as it is about to the packaged up into the installer.
1 parent 15b3e71 commit e416cb3

File tree

1 file changed

+45
-0
lines changed

1 file changed

+45
-0
lines changed

.github/workflows/swift-toolchain.yml

+45
Original file line numberDiff line numberDiff line change
@@ -2878,6 +2878,12 @@ jobs:
28782878
ref: ${{ inputs.swift_markdown_revision }}
28792879
path: ${{ github.workspace }}/SourceCache/swift-markdown
28802880
show-progress: false
2881+
- uses: actions/[email protected]
2882+
with:
2883+
repository: swiftlang/swift-build
2884+
ref: ${{ inputs.swift_build_revision }}
2885+
path: ${{ github.workspace }}/SourceCache/swift-build
2886+
show-progress: false
28812887
- uses: actions/[email protected]
28822888
with:
28832889
repository: swiftlang/swift-package-manager
@@ -3239,6 +3245,43 @@ jobs:
32393245
- name: Build swift-certificates
32403246
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-certificates
32413247

3248+
- name: Configure swift-build
3249+
run: |
3250+
# Workaround CMake 3.20 issue
3251+
$CLANG_CL = cygpath -m ${{ github.workspace }}/BinaryCache/Library/Developer/Toolchains/${{ inputs.swift_version }}+Asserts/usr/bin/clang-cl.exe
3252+
$SWIFTC = cygpath -m ${{ github.workspace }}/BinaryCache/Library/Developer/Toolchains/${{ inputs.swift_version }}+Asserts/usr/bin/swiftc.exe
3253+
3254+
cmake -B ${{ github.workspace }}/BinaryCache/swift-build `
3255+
-D BUILD_SHARED_LIBS=YES `
3256+
-D BUILD_TESTING=NO `
3257+
-D CMAKE_BUILD_TYPE=Release `
3258+
-D CMAKE_C_COMPILER=${CLANG_CL} `
3259+
-D CMAKE_C_COMPILER_TARGET=${{ matrix.triple }} `
3260+
-D CMAKE_C_FLAGS="${{ inputs.WINDOWS_CMAKE_C_FLAGS }}" `
3261+
-D CMAKE_CXX_COMPILER=${CLANG_CL} `
3262+
-D CMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} `
3263+
-D CMAKE_CXX_FLAGS="${{ inputs.WINDOWS_CMAKE_CXX_FLAGS }}" `
3264+
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/${{ inputs.swift_version }}+Asserts/usr `
3265+
-D CMAKE_Swift_COMPILER=${SWIFTC} `
3266+
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple }} `
3267+
-D CMAKE_Swift_COMPILER_WORKS=YES `
3268+
-D CMAKE_Swift_FLAGS="-sdk ${env:SDKROOT} ${{ inputs.CMAKE_Swift_FLAGS }}" `
3269+
-D CMAKE_Swift_FLAGS_RELEASE="-O" `
3270+
${{ matrix.cmake_linker_flags }} `
3271+
-D CMAKE_SYSTEM_NAME=Windows `
3272+
-D CMAKE_SYSTEM_PROCESSOR=${{ matrix.cpu }} `
3273+
-G Ninja `
3274+
-S ${{ github.workspace }}/SourceCache/swift-build `
3275+
-D ArgumentParser_DIR=${{ github.workspace }}/BinaryCache/swift-argument-parser/cmake/modules `
3276+
-D LLBuild_DIR=${{ github.workspace }}/BinaryCache/swift-llbuild/cmake/modules `
3277+
-D SwiftDriver_DIR=${{ github.workspace }}/BinaryCache/swift-driver/cmake/modules `
3278+
-D SwiftSystem_DIR=${{ github.workspace }}/BinaryCache/swift-system/cmake/modules `
3279+
-D TSC_DIR=${{ github.workspace }}/BinaryCache/swift-tools-support-core/cmake/modules `
3280+
-D SQLite3_INCLUDE_DIR=${{ github.workspace }}/BinaryCache/Library/sqlite-${{ inputs.swift_toolchain_sqlite_version }}/usr/include `
3281+
-D SQLite3_LIBRARY=${{ github.workspace }}/BinaryCache/Library/sqlite-${{ inputs.swift_toolchain_sqlite_version }}/usr/lib/SQLite3.lib
3282+
- name: Build swift-build
3283+
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-build
3284+
32423285
- name: extract swift-syntax
32433286
run: |
32443287
$module = "${{ github.workspace }}/BinaryCache/swift-syntax/cmake/modules/SwiftSyntaxConfig.cmake"
@@ -3453,6 +3496,8 @@ jobs:
34533496
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-tools-support-core --target install
34543497
- name: Install swift-driver
34553498
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-driver --target install
3499+
- name: Install swift-build
3500+
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-build --target install
34563501
- name: Install swift-package-manager
34573502
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-package-manager --target install
34583503
- name: Install SourceKit-LSP

0 commit comments

Comments
 (0)