From a0535239959fbc64639763d2fdf0f60eec36f050 Mon Sep 17 00:00:00 2001 From: Yifei Kong Date: Wed, 28 Feb 2024 12:47:09 +0800 Subject: [PATCH 1/2] Add --enable-ipv6 (#47) --- Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.in b/Makefile.in index af3cab6c..8efcbd93 100644 --- a/Makefile.in +++ b/Makefile.in @@ -368,6 +368,7 @@ $(CURL_VERSION)/.firefox: $(firefox_libs) $(CURL_VERSION).tar.xz $(CURL_VERSION) config_flags+=" --with-nss=$(nss_install_dir) --with-nss-deprecated"; \ config_flags+=" --without-zstd"; \ config_flags+=" --enable-websockets"; \ + config_flags+=" --enable-ipv6"; \ config_flags+=" USE_CURL_SSLKEYLOGFILE=true"; \ if test "$(static_build)" = "yes"; then \ config_flags+=" --enable-static --disable-shared"; \ @@ -411,6 +412,7 @@ $(CURL_VERSION)/.chrome: $(chrome_libs) $(CURL_VERSION).tar.xz $(CURL_VERSION)/. config_flags="$$config_flags --without-zstd"; \ config_flags="$$config_flags --enable-websockets"; \ config_flags="$$config_flags --enable-ech"; \ + config_flags="$$config_flags --enable-ipv6"; \ config_flags="$$config_flags USE_CURL_SSLKEYLOGFILE=true"; \ if test "$(static_build)" = "yes"; then \ config_flags="$$config_flags --enable-static --disable-shared"; From 605073717293bf443168656f52052d0de46f9af0 Mon Sep 17 00:00:00 2001 From: Brett Jia Date: Thu, 29 Feb 2024 14:54:49 -0500 Subject: [PATCH 2/2] Bundle dependency archives in release (#48) * include additional archives in tarball * copy in archives from build folders * fix boringssl paths * make less verbose --- .github/workflows/build-and-test-make.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test-make.yml b/.github/workflows/build-and-test-make.yml index 112970a8..16311671 100644 --- a/.github/workflows/build-and-test-make.yml +++ b/.github/workflows/build-and-test-make.yml @@ -153,11 +153,17 @@ jobs: # Upload pre-compiled binaries to GitHub releases page and Github actions archives. - name: Create tar release files for libcurl-impersonate run: | + cp ${{ runner.temp }}/zlib/lib/lib*.a ${{ runner.temp }}/install/lib + cp nghttp2*/installed/lib/lib*.a ${{ runner.temp }}/install/lib + cp brotli*/out/installed/lib/lib*.a ${{ runner.temp }}/install/lib + cp boringssl/build/lib/lib*.a ${{ runner.temp }}/install/lib + cd ${{ runner.temp }}/install/lib + ls -lah . if [[ "${{ startsWith(github.ref, 'refs/tags/') }}" == "true" ]]; then - tar -c -z -f ${{ runner.temp }}/libcurl-impersonate-${{ github.ref_name }}.${{ matrix.host }}.tar.gz libcurl-impersonate* + tar -c -z -f ${{ runner.temp }}/libcurl-impersonate-${{ github.ref_name }}.${{ matrix.host }}.tar.gz lib* else - tar -c -z -f ${{ runner.temp }}/libcurl-impersonate.${{ matrix.host }}.tar.gz libcurl-impersonate* + tar -c -z -f ${{ runner.temp }}/libcurl-impersonate.${{ matrix.host }}.tar.gz lib* fi echo "release_file_lib=${{ runner.temp }}/libcurl-impersonate-${{ github.ref_name }}.${{ matrix.host }}.tar.gz" >> $GITHUB_ENV