Skip to content

Commit 1b5a7bb

Browse files
committed
GHA: update curl version
CURL was updated to 8.9.1 upstream. Update the build rules to reflect that.
1 parent ea62eb9 commit 1b5a7bb

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

.github/workflows/swift-toolchain.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,7 +1015,7 @@ jobs:
10151015
- name: Configure curl
10161016
run: |
10171017
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
1018-
cmake -B ${{ github.workspace }}/BinaryCache/curl-7.77.0 `
1018+
cmake -B ${{ github.workspace }}/BinaryCache/curl-8.9.1 `
10191019
-D BUILD_SHARED_LIBS=NO `
10201020
-D CMAKE_BUILD_TYPE=Release `
10211021
-D CMAKE_C_COMPILER=${{ matrix.cc }} `
@@ -1025,7 +1025,7 @@ jobs:
10251025
-D CMAKE_CXX_COMPILER_LAUNCHER=sccache `
10261026
-D CMAKE_CXX_FLAGS="${{ matrix.cxxflags }}" `
10271027
-D CMAKE_MT=mt `
1028-
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/curl-7.77.0/usr `
1028+
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/curl-8.9.1/usr `
10291029
-D CMAKE_SYSTEM_NAME=${{ matrix.os }} `
10301030
${{ matrix.extra_flags }} `
10311031
-G Ninja `
@@ -1111,14 +1111,14 @@ jobs:
11111111
-D CMAKE_POSITION_INDEPENDENT_CODE=YES `
11121112
-D CMAKE_ANDROID_NDK=$NDKPATH
11131113
- name: Build curl
1114-
run: cmake --build ${{ github.workspace }}/BinaryCache/curl-7.77.0
1114+
run: cmake --build ${{ github.workspace }}/BinaryCache/curl-8.9.1
11151115
- name: Install curl
1116-
run: cmake --build ${{ github.workspace }}/BinaryCache/curl-7.77.0 --target install
1116+
run: cmake --build ${{ github.workspace }}/BinaryCache/curl-8.9.1 --target install
11171117

11181118
- uses: actions/upload-artifact@v4
11191119
with:
1120-
name: curl-${{ matrix.os }}-${{ matrix.arch }}-7.77.0
1121-
path: ${{ github.workspace }}/BuildRoot/Library/curl-7.77.0/usr
1120+
name: curl-${{ matrix.os }}-${{ matrix.arch }}-8.9.1
1121+
path: ${{ github.workspace }}/BuildRoot/Library/curl-8.9.1/usr
11221122

11231123
libxml2:
11241124
needs: [context]
@@ -1365,8 +1365,8 @@ jobs:
13651365
path: ${{ github.workspace }}/BuildRoot/Library/libxml2-2.11.5/usr
13661366
- uses: actions/download-artifact@v4
13671367
with:
1368-
name: curl-${{ matrix.os }}-${{ matrix.arch }}-7.77.0
1369-
path: ${{ github.workspace }}/BuildRoot/Library/curl-7.77.0/usr
1368+
name: curl-${{ matrix.os }}-${{ matrix.arch }}-8.9.1
1369+
path: ${{ github.workspace }}/BuildRoot/Library/curl-8.9.1/usr
13701370
- uses: actions/download-artifact@v4
13711371
with:
13721372
name: zlib-${{ matrix.os }}-${{ matrix.arch }}-1.3
@@ -1656,7 +1656,7 @@ jobs:
16561656
-G Ninja `
16571657
-S ${{ github.workspace }}/SourceCache/swift-corelibs-foundation `
16581658
-D dispatch_DIR=${{ github.workspace }}/BinaryCache/libdispatch/cmake/modules `
1659-
-D CURL_DIR=${{ github.workspace }}/BuildRoot/Library/curl-7.77.0/usr/lib/cmake/CURL `
1659+
-D CURL_DIR=${{ github.workspace }}/BuildRoot/Library/curl-8.9.1/usr/lib/cmake/CURL `
16601660
-D FOUNDATION_BUILD_TOOLS=${build_tools} `
16611661
-D ENABLE_TESTING=NO `
16621662
-D _SwiftFoundation_SourceDIR=$SWIFT_FOUNDATION_SOURCE_DIR `

0 commit comments

Comments
 (0)