Skip to content

Commit eff880a

Browse files
speednoisemovementspeednoisemovement
authored
Build cURL with Brotli (#1042)
1 parent c353476 commit eff880a

File tree

1 file changed

+40
-3
lines changed

1 file changed

+40
-3
lines changed

‎.github/workflows/swift-toolchain.yml‎

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1440,7 +1440,7 @@ jobs:
14401440
path: ${{ github.workspace }}/BuildRoot/Library/brotli-${{ inputs.brotli_version }}/usr
14411441

14421442
curl:
1443-
needs: [zlib]
1443+
needs: [zlib, brotli]
14441444
runs-on: ${{ inputs.default_build_runner }}
14451445

14461446
strategy:
@@ -1493,6 +1493,11 @@ jobs:
14931493
name: ${{ matrix.os }}-${{ matrix.arch }}-zlib-${{ inputs.zlib_version }}
14941494
path: ${{ github.workspace }}/BuildRoot/Library/zlib-${{ inputs.zlib_version }}/usr
14951495

1496+
- uses: actions/download-artifact@v4
1497+
with:
1498+
name: ${{ matrix.os }}-${{ matrix.arch }}-brotli-${{ inputs.brotli_version }}
1499+
path: ${{ github.workspace }}/BuildRoot/Library/brotli-${{ inputs.brotli_version }}/usr
1500+
14961501
- uses: nttld/setup-ndk@v1
14971502
if: matrix.os == 'Android'
14981503
id: setup-ndk
@@ -1530,7 +1535,7 @@ jobs:
15301535
'CURL_CA_BUNDLE' = "none";
15311536
'CURL_CA_FALLBACK' = "NO";
15321537
'CURL_CA_PATH' = "none";
1533-
'CURL_BROTLI' = "NO";
1538+
'CURL_BROTLI' = "YES";
15341539
'CURL_DISABLE_ALTSVC' = "NO";
15351540
'CURL_DISABLE_AWS' = "YES";
15361541
'CURL_DISABLE_BASIC_AUTH' = "NO";
@@ -1608,6 +1613,9 @@ jobs:
16081613
'USE_WIN32_LDAP' = "NO";
16091614
'ZLIB_ROOT' = "${{ github.workspace }}/BuildRoot/Library/zlib-${{ inputs.zlib_version }}/usr";
16101615
'ZLIB_LIBRARY' = "${{ github.workspace }}/BuildRoot/Library/zlib-${{ inputs.zlib_version }}/usr/lib/zlibstatic.lib";
1616+
'BROTLI_INCLUDE_DIR' = "${{ github.workspace }}/BuildRoot/Library/brotli-${{ inputs.brotli_version }}/usr/include";
1617+
'BROTLICOMMON_LIBRARY' = "${{ github.workspace }}/BuildRoot/Library/brotli-${{ inputs.brotli_version }}/usr/lib/brotlicommon.lib";
1618+
'BROTLIDEC_LIBRARY' = "${{ github.workspace }}/BuildRoot/Library/brotli-${{ inputs.brotli_version }}/usr/lib/brotlidec.lib";
16111619
'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && '' || '-fuse-ld=lld' }}";
16121620
}
16131621
- name: Build curl
@@ -2173,6 +2181,11 @@ jobs:
21732181
with:
21742182
name: ${{ matrix.os }}-${{ matrix.arch }}-zlib-${{ inputs.zlib_version }}
21752183
path: ${{ github.workspace }}/BuildRoot/Library/zlib-${{ inputs.zlib_version }}/usr
2184+
- uses: actions/download-artifact@v4
2185+
if: matrix.os != 'Android' || inputs.build_android
2186+
with:
2187+
name: ${{ matrix.os }}-${{ matrix.arch }}-brotli-${{ inputs.brotli_version }}
2188+
path: ${{ github.workspace }}/BuildRoot/Library/brotli-${{ inputs.brotli_version }}/usr
21762189

21772190
- name: Download Compilers
21782191
if: matrix.os != 'Android' || inputs.build_android
@@ -2751,7 +2764,7 @@ jobs:
27512764
sdk:
27522765
# TODO: Build this on macOS or make an equivalent Mac-only job
27532766
if: inputs.build_os == 'Windows'
2754-
needs: [libxml2, curl, zlib, compilers, cmark_gfm, stdlib, macros]
2767+
needs: [libxml2, curl, zlib, brotli, compilers, cmark_gfm, stdlib, macros]
27552768
runs-on: ${{ inputs.default_build_runner }}
27562769

27572770
strategy:
@@ -2834,6 +2847,11 @@ jobs:
28342847
with:
28352848
name: ${{ matrix.os }}-${{ matrix.arch }}-zlib-${{ inputs.zlib_version }}
28362849
path: ${{ github.workspace }}/BuildRoot/Library/zlib-${{ inputs.zlib_version }}/usr
2850+
- uses: actions/download-artifact@v4
2851+
if: matrix.os != 'Android' || inputs.build_android
2852+
with:
2853+
name: ${{ matrix.os }}-${{ matrix.arch }}-brotli-${{ inputs.brotli_version }}
2854+
path: ${{ github.workspace }}/BuildRoot/Library/brotli-${{ inputs.brotli_version }}/usr
28372855

28382856
- name: Download Compilers
28392857
if: matrix.os != 'Android' || inputs.build_android
@@ -4643,6 +4661,11 @@ jobs:
46434661
with:
46444662
name: Windows-amd64-zlib-${{ inputs.zlib_version }}
46454663
path: ${{ github.workspace }}/BuildRoot/Library/zlib
4664+
- uses: actions/download-artifact@v4
4665+
with:
4666+
name: Windows-amd64-brotli-${{ inputs.brotli_version }}
4667+
path: ${{ github.workspace }}/BuildRoot/Library/brotli/
4668+
46464669

46474670
- run: |
46484671
New-Item -Path "${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift/windows/x86_64/" -ItemType Directory -Force | Out-Null
@@ -4666,6 +4689,8 @@ jobs:
46664689
Move-Item ${{ github.workspace }}/BuildRoot/Library/libxml2/lib/libxml2s.lib ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/WindowsExperimental.sdk/usr/lib/swift_static/windows/x86_64/
46674690
Move-Item ${{ github.workspace }}/BuildRoot/Library/curl/lib/libcurl.lib ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/WindowsExperimental.sdk/usr/lib/swift_static/windows/x86_64/
46684691
Move-Item ${{ github.workspace }}/BuildRoot/Library/zlib/lib/zlibstatic.lib ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/WindowsExperimental.sdk/usr/lib/swift_static/windows/x86_64/
4692+
Move-Item ${{ github.workspace }}/BuildRoot/Library/brotli/lib/brotlicommon.lib ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/WindowsExperimental.sdk/usr/lib/swift_static/windows/x86_64/
4693+
Move-Item ${{ github.workspace }}/BuildRoot/Library/brotli/lib/brotlidec.lib ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/WindowsExperimental.sdk/usr/lib/swift_static/windows/x86_64/
46694694
46704695
Move-Item ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift/windows/Foundation.lib ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift/windows/x86_64/
46714696
Move-Item ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift/windows/FoundationXML.lib ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift/windows/x86_64/
@@ -4729,6 +4754,10 @@ jobs:
47294754
with:
47304755
name: Windows-arm64-zlib-${{ inputs.zlib_version }}
47314756
path: ${{ github.workspace }}/BuildRoot/Library/zlib
4757+
- uses: actions/download-artifact@v4
4758+
with:
4759+
name: Windows-arm64-brotli-${{ inputs.brotli_version }}
4760+
path: ${{ github.workspace }}/BuildRoot/Library/brotli
47324761

47334762
- run: |
47344763
New-Item -Path "${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift/windows/aarch64/" -ItemType Directory -Force
@@ -4752,6 +4781,8 @@ jobs:
47524781
Move-Item ${{ github.workspace }}/BuildRoot/Library/libxml2/lib/libxml2s.lib ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/WindowsExperimental.sdk/usr/lib/swift_static/windows/aarch64/
47534782
Move-Item ${{ github.workspace }}/BuildRoot/Library/curl/lib/libcurl.lib ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/WindowsExperimental.sdk/usr/lib/swift_static/windows/aarch64/
47544783
Move-Item ${{ github.workspace }}/BuildRoot/Library/zlib/lib/zlibstatic.lib ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/WindowsExperimental.sdk/usr/lib/swift_static/windows/aarch64/
4784+
Move-Item ${{ github.workspace }}/BuildRoot/Library/brotli/lib/brotlidec.lib ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/WindowsExperimental.sdk/usr/lib/swift_static/windows/aarch64/
4785+
Move-Item ${{ github.workspace }}/BuildRoot/Library/brotli/lib/brotlicommon.lib ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/WindowsExperimental.sdk/usr/lib/swift_static/windows/aarch64/
47554786
47564787
Move-Item ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift/windows/Foundation.lib ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift/windows/aarch64/
47574788
Move-Item ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift/windows/FoundationXML.lib ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift/windows/aarch64/
@@ -4815,6 +4846,10 @@ jobs:
48154846
with:
48164847
name: Windows-x86-zlib-${{ inputs.zlib_version }}
48174848
path: ${{ github.workspace }}/BuildRoot/Library/zlib
4849+
- uses: actions/download-artifact@v4
4850+
with:
4851+
name: Windows-x86-brotli-${{ inputs.brotli_version }}
4852+
path: ${{ github.workspace }}/BuildRoot/Library/brotli
48184853

48194854
- run: |
48204855
New-Item -Path "${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift/windows/i686/" -ItemType Directory -Force
@@ -4838,6 +4873,8 @@ jobs:
48384873
Move-Item ${{ github.workspace }}/BuildRoot/Library/libxml2/lib/libxml2s.lib ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/WindowsExperimental.sdk/usr/lib/swift_static/windows/i686/
48394874
Move-Item ${{ github.workspace }}/BuildRoot/Library/curl/lib/libcurl.lib ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/WindowsExperimental.sdk/usr/lib/swift_static/windows/i686/
48404875
Move-Item ${{ github.workspace }}/BuildRoot/Library/zlib/lib/zlibstatic.lib ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/WindowsExperimental.sdk/usr/lib/swift_static/windows/i686/
4876+
Move-Item ${{ github.workspace }}/BuildRoot/Library/brotli/lib/brotlidec.lib ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/WindowsExperimental.sdk/usr/lib/swift_static/windows/i686/
4877+
Move-Item ${{ github.workspace }}/BuildRoot/Library/brotli/lib/brotlicommon.lib ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/WindowsExperimental.sdk/usr/lib/swift_static/windows/i686/
48414878
48424879
Move-Item ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift/windows/Foundation.lib ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift/windows/i686/
48434880
Move-Item ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift/windows/FoundationXML.lib ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift/windows/i686/

0 commit comments

Comments
 (0)