mirror of
https://github.com/lwthiker/curl-impersonate.git
synced 2026-08-25 20:48:13 +00:00
Upgrade baseline curl to 8.1.1 (#160)
* Upgrade baseline curl to 8.1.1 New curl version includes bugfixes, new options but mainly websocket support which was long requested in curl impersonate. Upstream curl reworked a lot of their http2 code which necessitated a lot of changes on our side as well. * Fix build on mac due to bad header priorities On macos, clang gives priority to /usr/local/include over locations specified with -isystem for some unknown reason. In turn this causes clang to use the system's openssl, which conflicts with curl-impersonate's boringssl headers. To prevent that, disable curl's automatic conversion of -I flags to -isystem. * Upgrade zlib version * Upgrade GitHub Mac runner to macos-12 * Upgrade nghttp2 version to 1.56.0 curl-8.1.1 uses an nghttp2 function that only exists in newer versions of nghttp2.
This commit is contained in:
14
.github/workflows/build-and-test-make.yml
vendored
14
.github/workflows/build-and-test-make.yml
vendored
@@ -20,7 +20,7 @@ jobs:
|
||||
runs-on: ${{ matrix.os }}
|
||||
strategy:
|
||||
matrix:
|
||||
os: [ubuntu-20.04, macos-11]
|
||||
os: [ubuntu-20.04, macos-12]
|
||||
arch: [x86_64]
|
||||
include:
|
||||
- os: ubuntu-20.04
|
||||
@@ -38,7 +38,7 @@ jobs:
|
||||
host: arm-linux-gnueabihf
|
||||
capture_interface: eth0
|
||||
make: make
|
||||
- os: macos-11
|
||||
- os: macos-12
|
||||
arch: x86_64
|
||||
host: x86_64-macos
|
||||
capture_interface: en0
|
||||
@@ -66,7 +66,7 @@ jobs:
|
||||
sudo apt-get install gcc-${{ matrix.host }} g++-${{ matrix.host }}
|
||||
|
||||
- name: Install macOS dependencies
|
||||
if: matrix.os == 'macos-11'
|
||||
if: matrix.os == 'macos-12'
|
||||
run: |
|
||||
brew install pkg-config make cmake ninja autoconf automake libtool
|
||||
# Chrome version dependencies
|
||||
@@ -92,9 +92,9 @@ jobs:
|
||||
# When cross compiling we need to build zlib first.
|
||||
- name: Build zlib
|
||||
run: |
|
||||
curl -LO https://zlib.net/zlib-1.2.13.tar.gz
|
||||
tar xf zlib-1.2.13.tar.gz
|
||||
cd zlib-1.2.13
|
||||
curl -LO https://zlib.net/zlib-1.3.tar.gz
|
||||
tar xf zlib-1.3.tar.gz
|
||||
cd zlib-1.3
|
||||
CHOST=${{ matrix.host }} ./configure --prefix=${{ runner.temp }}/zlib
|
||||
make
|
||||
make install
|
||||
@@ -255,4 +255,4 @@ jobs:
|
||||
with:
|
||||
files: |
|
||||
${{ env.release_file_lib }}
|
||||
${{ env.release_file_bin }}
|
||||
${{ env.release_file_bin }}
|
||||
|
||||
Reference in New Issue
Block a user