From b0e064268e4bf2d0505dd583ece1a6ef8073144c Mon Sep 17 00:00:00 2001 From: Brett Jia Date: Thu, 7 Mar 2024 11:58:10 -0500 Subject: [PATCH 1/6] set older macos deployment target --- .github/workflows/build-and-test-make.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-and-test-make.yml b/.github/workflows/build-and-test-make.yml index 4f1b31bf..6164bdbc 100644 --- a/.github/workflows/build-and-test-make.yml +++ b/.github/workflows/build-and-test-make.yml @@ -17,6 +17,7 @@ permissions: env: BORING_SSL_COMMIT: d24a38200fef19150eef00cad35b138936c08767 + MACOSX_DEPLOYMENT_TARGET: 10.5 jobs: build-and-test-linux: From 57bad46e749021aad247128f45cc4a2ae63bf931 Mon Sep 17 00:00:00 2001 From: Brett Jia Date: Fri, 15 Mar 2024 09:22:27 -0400 Subject: [PATCH 2/6] Try 10.9 --- .github/workflows/build-and-test-make.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test-make.yml b/.github/workflows/build-and-test-make.yml index 6164bdbc..dcfba0b9 100644 --- a/.github/workflows/build-and-test-make.yml +++ b/.github/workflows/build-and-test-make.yml @@ -17,7 +17,7 @@ permissions: env: BORING_SSL_COMMIT: d24a38200fef19150eef00cad35b138936c08767 - MACOSX_DEPLOYMENT_TARGET: 10.5 + MACOSX_DEPLOYMENT_TARGET: 10.9 jobs: build-and-test-linux: From bdf0439eaa723c069b75c88bc3ff4fc2b70d5212 Mon Sep 17 00:00:00 2001 From: Brett Jia Date: Sat, 6 Apr 2024 11:24:14 -0400 Subject: [PATCH 3/6] upload macos artifacts to gh actions --- .github/workflows/build-and-test-make.yml | 30 +++++++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-test-make.yml b/.github/workflows/build-and-test-make.yml index dcfba0b9..92693460 100644 --- a/.github/workflows/build-and-test-make.yml +++ b/.github/workflows/build-and-test-make.yml @@ -333,13 +333,23 @@ jobs: python_bin=$(which python3) sudo $python_bin -m pytest . --log-cli-level DEBUG --install-dir ${{ runner.temp }}/install --capture-interface ${{ matrix.capture_interface }} - # Upload pre-compiled binaries to GitHub releases page. + # Upload pre-compiled binaries to GitHub releases page and Github actions archives. - name: Create tar release files for libcurl-impersonate - if: startsWith(github.ref, 'refs/tags/') run: | - cd ${{ 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* - echo "release_file_lib=${{ runner.temp }}/libcurl-impersonate-${{ github.ref_name }}.${{ matrix.host }}.tar.gz" >> $GITHUB_ENV + else + tar -c -z -f ${{ runner.temp }}/libcurl-impersonate.${{ matrix.host }}.tar.gz libcurl-impersonate* + fi + echo "release_file_lib=${{ runner.temp }}/libcurl-impersonate-${{ github.ref_name }}.${{ matrix.host }}.tar.gz" >> $GITHUB_ENV + + - name: Upload artifacts + uses: actions/upload-artifact@v4 + with: + name: libcurl-impersonate.${{ matrix.host }}.tar.gz + path: ${{ runner.temp }}/libcurl-impersonate*.tar.gz - name: Clean build if: startsWith(github.ref, 'refs/tags/') @@ -365,9 +375,19 @@ jobs: if: startsWith(github.ref, 'refs/tags/') run: | cd ${{ runner.temp }}/install/bin - tar -c -z -f ${{ runner.temp }}/curl-impersonate-${{ github.ref_name }}.${{ matrix.host }}.tar.gz curl-impersonate-chrome curl_* + if [[ "${{ startsWith(github.ref, 'refs/tags/') }}" == "true" ]]; then + tar -c -z -f ${{ runner.temp }}/curl-impersonate-${{ github.ref_name }}.${{ matrix.host }}.tar.gz curl-impersonate-chrome curl_* + else + tar -c -z -f ${{ runner.temp }}/curl-impersonate.${{ matrix.host }}.tar.gz curl-impersonate-chrome curl_* + fi echo "release_file_bin=${{ runner.temp }}/curl-impersonate-${{ github.ref_name }}.${{ matrix.host }}.tar.gz" >> $GITHUB_ENV + - name: Upload artifacts + uses: actions/upload-artifact@v4 + with: + name: curl-impersonate.${{ matrix.host }}.tar.gz + path: ${{ runner.temp }}/curl-impersonate*.tar.gz + - name: Upload release files uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/') From 873da8fe3352dcee06e4177a1573d24182c350b3 Mon Sep 17 00:00:00 2001 From: Brett Jia Date: Sat, 6 Apr 2024 11:25:28 -0400 Subject: [PATCH 4/6] alwaos create tarballs --- .github/workflows/build-and-test-make.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-and-test-make.yml b/.github/workflows/build-and-test-make.yml index 92693460..6418e2ba 100644 --- a/.github/workflows/build-and-test-make.yml +++ b/.github/workflows/build-and-test-make.yml @@ -372,7 +372,6 @@ jobs: ${{ matrix.make }} chrome-install-strip - name: Create tar release files for curl-impersonate - if: startsWith(github.ref, 'refs/tags/') run: | cd ${{ runner.temp }}/install/bin if [[ "${{ startsWith(github.ref, 'refs/tags/') }}" == "true" ]]; then From 225516089da869fd48b0f335134c0a961d27dab0 Mon Sep 17 00:00:00 2001 From: Brett Jia Date: Sun, 7 Apr 2024 11:59:57 -0400 Subject: [PATCH 5/6] build macos statically on PR --- .github/workflows/build-and-test-make.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build-and-test-make.yml b/.github/workflows/build-and-test-make.yml index 6418e2ba..6e2e23eb 100644 --- a/.github/workflows/build-and-test-make.yml +++ b/.github/workflows/build-and-test-make.yml @@ -352,7 +352,6 @@ jobs: path: ${{ runner.temp }}/libcurl-impersonate*.tar.gz - name: Clean build - if: startsWith(github.ref, 'refs/tags/') run: | ${{ matrix.make }} chrome-clean rm -Rf ${{ runner.temp }}/install @@ -360,12 +359,10 @@ jobs: # Recompile curl-impersonate statically when doing a release. - name: Reconfigure statically - if: startsWith(github.ref, 'refs/tags/') run: | ./configure --prefix=${{ runner.temp }}/install --enable-static - name: Rebuild statically - if: startsWith(github.ref, 'refs/tags/') run: | ${{ matrix.make }} chrome-build ${{ matrix.make }} chrome-checkbuild From f375f314092b58575caa9c67d7f30661c9e20665 Mon Sep 17 00:00:00 2001 From: Brett Jia Date: Sun, 7 Apr 2024 12:20:54 -0400 Subject: [PATCH 6/6] disable libidn2 --- Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.in b/Makefile.in index 8efcbd93..6e969ceb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -410,6 +410,7 @@ $(CURL_VERSION)/.chrome: $(chrome_libs) $(CURL_VERSION).tar.xz $(CURL_VERSION)/. config_flags="$$config_flags --with-brotli=$(brotli_install_dir)"; \ config_flags="$$config_flags --with-openssl=$(boringssl_install_dir)"; \ config_flags="$$config_flags --without-zstd"; \ + config_flags="$$config_flags --without-libidn2"; \ config_flags="$$config_flags --enable-websockets"; \ config_flags="$$config_flags --enable-ech"; \ config_flags="$$config_flags --enable-ipv6"; \