Skip to content

Commit 4d59da3

Browse files
Steelskincompnerd
authored andcommitted
[compilers] Add libxml2 to the compilers job
libxml2 was added as a required dependency downstream in swiftlang/swift#77862. This brings in the libxml2 build to the compilers job to fix the build.
1 parent d80dfe0 commit 4d59da3

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

.github/workflows/swift-toolchain.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,7 @@ jobs:
805805
compilers:
806806
# TODO: Build this on macOS or make an equivalent Mac-only job
807807
if: inputs.build_os == 'Windows'
808-
needs: [build_tools, cmark_gfm, early_swift_driver]
808+
needs: [libxml2, build_tools, cmark_gfm, early_swift_driver]
809809
runs-on: ${{ inputs.compilers_build_runner }}
810810

811811
env:
@@ -831,6 +831,10 @@ jobs:
831831
with:
832832
name: build-tools-Windows
833833
path: ${{ github.workspace }}/BinaryCache/0/bin
834+
- uses: actions/download-artifact@v4
835+
with:
836+
name: libxml2-Windows-${{ matrix.arch }}-${{ inputs.libxml2_version }}
837+
path: ${{ github.workspace }}/BinaryCache/Library/libxml2-${{ inputs.libxml2_version }}/usr
834838
- uses: actions/download-artifact@v4
835839
with:
836840
name: cmark-gfm-Windows-${{ matrix.arch }}-${{ inputs.swift_cmark_version }}
@@ -1000,6 +1004,8 @@ jobs:
10001004
-D CLANG_VENDOR=compnerd.org `
10011005
-D CLANG_VENDOR_UTI=org.compnerd.dt `
10021006
-D cmark-gfm_DIR=${{ github.workspace }}/BinaryCache/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr/lib/cmake `
1007+
-D LIBXML2_INCLUDE_DIR=${{ github.workspace }}/BinaryCache/Library/libxml2-${{ inputs.libxml2_version }}/usr/include/libxml2 `
1008+
-D LIBXML2_LIBRARY=${{ github.workspace }}/BinaryCache/Library/libxml2-${{ inputs.libxml2_version }}/usr/lib/libxml2s.lib `
10031009
-D PACKAGE_VENDOR=compnerd.org `
10041010
-D SWIFT_VENDOR=compnerd.org `
10051011
-D LLVM_PARALLEL_LINK_JOBS=2 `

0 commit comments

Comments
 (0)