From 40f761562df11b4c75c63609991c925a225af31d Mon Sep 17 00:00:00 2001
From: Sebastiano Merlino <sebastiano@hey.com>
Date: Tue, 2 Jul 2024 00:30:35 -0700
Subject: [PATCH 1/2] Update verify-build.yml
Upgrade curl to version 8.8.0
---
.github/workflows/verify-build.yml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml
index 77530449..f566161d 100644
--- a/.github/workflows/verify-build.yml
+++ b/.github/workflows/verify-build.yml
@@ -339,25 +339,25 @@ jobs:
sudo make install ;
if: ${{ matrix.build-type == 'iwyu' && matrix.os-type == 'ubuntu' }}
- - name: CURL from cache (for testing)
+ - name: CURL from cache (for testing on mac)
id: cache-CURL
uses: actions/cache@v2
with:
- path: curl-7.75.0
+ path: curl-8.8.0
key: ${{ matrix.os }}-CURL-pre-built
if: ${{ matrix.os == 'macos-latest' }}
- - name: Build CURL (for testing)
+ - name: Build CURL (for testing on mac)
run: |
- curl https://libhttpserver.s3.amazonaws.com/travis_stuff/curl-7.75.0.tar.gz -o curl-7.75.0.tar.gz ;
- tar -xzf curl-7.75.0.tar.gz ;
- cd curl-7.75.0 ;
+ curl https://libhttpserver.s3.amazonaws.com/travis_stuff/curl-8.8.0.tar -o curl-8.8.0.tar ;
+ tar -xzf curl-8.8.0.tar ;
+ cd curl-8.8.0 ;
if [ "$matrix.os-type" = "ubuntu" ]; then ./configure ; else ./configure --with-darwinssl ; fi
make ;
if: ${{ matrix.os == 'macos-latest' && steps.cache-CURL.outputs.cache-hit != 'true' }}
- name: Install CURL (for testing on mac only)
- run: cd curl-7.75.0 ; sudo make install ;
+ run: cd curl-8.8.0 ; sudo make install ;
if: ${{ matrix.os == 'macos-latest' }}
- name: Install CURL (for testing on linux)
From 973fac44c96ab8335f67de9ef6057fc4e151b077 Mon Sep 17 00:00:00 2001
From: Sebastiano Merlino <sebastiano@hey.com>
Date: Tue, 2 Jul 2024 00:43:46 -0700
Subject: [PATCH 2/2] --darwin-ssl does not exist anymore.
Update to use new option --with-secure-transport
---
.github/workflows/verify-build.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml
index f566161d..8765ddc5 100644
--- a/.github/workflows/verify-build.yml
+++ b/.github/workflows/verify-build.yml
@@ -352,7 +352,7 @@ jobs:
curl https://libhttpserver.s3.amazonaws.com/travis_stuff/curl-8.8.0.tar -o curl-8.8.0.tar ;
tar -xzf curl-8.8.0.tar ;
cd curl-8.8.0 ;
- if [ "$matrix.os-type" = "ubuntu" ]; then ./configure ; else ./configure --with-darwinssl ; fi
+ if [ "$matrix.os-type" = "ubuntu" ]; then ./configure ; else ./configure --with-secure-transport ; fi
make ;
if: ${{ matrix.os == 'macos-latest' && steps.cache-CURL.outputs.cache-hit != 'true' }}