diff --git a/README.md b/README.md index 37514bf54..7e250ee23 100644 --- a/README.md +++ b/README.md @@ -209,7 +209,7 @@ #### Impersonation * [**curl_cffi**](https://github.com/lexiforest/curl_cffi) (recommended) - Python binding for [curl-impersonate](https://github.com/lexiforest/curl-impersonate). Provides impersonation targets for Chrome, Edge and Safari. Licensed under [MIT](https://github.com/lexiforest/curl_cffi/blob/main/LICENSE) * Can be installed with the `curl-cffi` group, e.g. `pip install "yt-dlp[default,curl-cffi]"` - * Currently included in all builds *except* `yt-dlp_x86` (Windows 32-bit) and `yt-dlp` (Unix zipimport binary) + * Currently included in most builds *except* `yt-dlp` (Unix zipimport binary), `yt-dlp_x86` (Windows 32-bit) and `yt-dlp_musllinux_aarch64` ### Metadata diff --git a/bundle/docker/compose.yml b/bundle/docker/compose.yml index 706025b62..5f979e423 100644 --- a/bundle/docker/compose.yml +++ b/bundle/docker/compose.yml @@ -105,6 +105,7 @@ services: CHANNEL: ${CHANNEL} ORIGIN: ${ORIGIN} VERSION: ${VERSION} + EXCLUDE_CURL_CFFI: "1" volumes: - ~/build:/build - ../..:/yt-dlp @@ -120,5 +121,6 @@ services: environment: EXE_NAME: ${EXE_NAME} SKIP_UPDATE_TO: "1" + EXCLUDE_CURL_CFFI: "1" volumes: - ~/build:/build diff --git a/bundle/docker/linux/entrypoint.sh b/bundle/docker/linux/entrypoint.sh index 82a29f48c..e7a6a2e5b 100755 --- a/bundle/docker/linux/entrypoint.sh +++ b/bundle/docker/linux/entrypoint.sh @@ -9,10 +9,19 @@ function runpy { esac } +INCLUDES=( + --include pyinstaller + --include secretstorage +) + +if [[ -z "${EXCLUDE_CURL_CFFI:-}" ]]; then + INCLUDES+=(--include curl-cffi) +fi + runpy -m venv /yt-dlp-build-venv source /yt-dlp-build-venv/bin/activate runpy -m devscripts.install_deps -o --include build -runpy -m devscripts.install_deps --include secretstorage --include curl-cffi --include pyinstaller +runpy -m devscripts.install_deps "${INCLUDES[@]}" runpy -m devscripts.make_lazy_extractors runpy devscripts/update-version.py -c "${CHANNEL}" -r "${ORIGIN}" "${VERSION}" diff --git a/bundle/docker/linux/verify.sh b/bundle/docker/linux/verify.sh index e547d059b..3fabcefa2 100755 --- a/bundle/docker/linux/verify.sh +++ b/bundle/docker/linux/verify.sh @@ -3,8 +3,9 @@ set -exuo chmod +x /build/${EXE_NAME} -# TEMPORARY: -/build/${EXE_NAME} -v --print-traffic -o- --impersonate chrome "https://tls.browserleaks.com/json" | cat +if [ -n "${EXCLUDE_CURL_CFFI:-}" ]; then + /build/${EXE_NAME} -v --print-traffic -o- --impersonate chrome "https://tls.browserleaks.com/json" | cat +fi if [ -n "${SKIP_UPDATE_TO:-}" ]; then /build/${EXE_NAME} -v || true