From 9778ff9aa69ee7cc5325ead7c6ebebc9ddab1968 Mon Sep 17 00:00:00 2001 From: bashonly Date: Tue, 21 Nov 2023 16:03:42 -0600 Subject: [PATCH 1/7] [build] Use ubuntu 20.04 for Linux ARM builds Authored by: bashonly --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d944659b8..08affebd9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -197,7 +197,7 @@ jobs: GITHUB_WORKFLOW: build githubToken: ${{ github.token }} # To cache image arch: ${{ matrix.architecture }} - distro: ubuntu18.04 # Standalone executable should be built on minimum supported OS + distro: ubuntu20.04 # Standalone executable should be built on minimum supported OS dockerRunArgs: --volume "${PWD}/repo:/repo" install: | # Installing Python 3.10 from the Deadsnakes repo raises errors apt update From 6306be5398709dfa6297f15148038ac5cb6efd19 Mon Sep 17 00:00:00 2001 From: bashonly Date: Tue, 21 Nov 2023 23:01:00 -0600 Subject: [PATCH 2/7] [build] Install `secretstorage` with apt Authored by: bashonly --- .github/workflows/build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 08affebd9..963528f83 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -201,14 +201,15 @@ jobs: dockerRunArgs: --volume "${PWD}/repo:/repo" install: | # Installing Python 3.10 from the Deadsnakes repo raises errors apt update - apt -y install zlib1g-dev python3.8 python3.8-dev python3.8-distutils python3-pip + apt -y install zlib1g-dev python3.8 python3.8-dev python3.8-distutils python3-pip \ + python3-secretstorage # Cannot build cryptography wheel in virtual armv7 environment python3.8 -m pip install -U pip setuptools wheel # Cannot access requirements.txt from the repo directory at this stage - python3.8 -m pip install -U Pyinstaller mutagen pycryptodomex websockets brotli certifi secretstorage + python3.8 -m pip install -U Pyinstaller mutagen pycryptodomex websockets brotli certifi run: | cd repo - python3.8 -m pip install -U Pyinstaller secretstorage -r requirements.txt # Cached version may be out of date + python3.8 -m pip install -U Pyinstaller -r requirements.txt # Cached version may be out of date python3.8 devscripts/update-version.py -c "${{ inputs.channel }}" -r "${{ needs.process.outputs.origin }}" "${{ inputs.version }}" python3.8 devscripts/make_lazy_extractors.py python3.8 pyinst.py From 043390f4b40c14c9bd4a0e4ba3e5e9873de9f37b Mon Sep 17 00:00:00 2001 From: bashonly Date: Tue, 21 Nov 2023 23:02:17 -0600 Subject: [PATCH 3/7] [build] Sync cached deps with requirements.txt Authored by: bashonly --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 963528f83..aea5beb18 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -204,8 +204,9 @@ jobs: apt -y install zlib1g-dev python3.8 python3.8-dev python3.8-distutils python3-pip \ python3-secretstorage # Cannot build cryptography wheel in virtual armv7 environment python3.8 -m pip install -U pip setuptools wheel - # Cannot access requirements.txt from the repo directory at this stage - python3.8 -m pip install -U Pyinstaller mutagen pycryptodomex websockets brotli certifi + # XXX: Keep this in sync with requirements.txt, which cannot be accessed at this stage + python3.8 -m pip install -U Pyinstaller mutagen pycryptodomex certifi brotli \ + 'requests>=2.31.0,<3' 'urllib3>=1.26.17,<3' 'websockets>=12.0' run: | cd repo From e7959745a863217e8d0d8842e4896f1f84795720 Mon Sep 17 00:00:00 2001 From: bashonly Date: Tue, 21 Nov 2023 23:06:29 -0600 Subject: [PATCH 4/7] [build] Try to update all pip-installed packages Authored by: bashonly --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aea5beb18..daf5d2c12 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -210,7 +210,9 @@ jobs: run: | cd repo - python3.8 -m pip install -U Pyinstaller -r requirements.txt # Cached version may be out of date + # Cached versions of may be out of date + python3.8 -m pip install -U pip setuptools wheel + python3.8 -m pip install -U Pyinstaller -r requirements.txt python3.8 devscripts/update-version.py -c "${{ inputs.channel }}" -r "${{ needs.process.outputs.origin }}" "${{ inputs.version }}" python3.8 devscripts/make_lazy_extractors.py python3.8 pyinst.py From 33b43c5db5e4d71c883bd03d8f4f0867e704df74 Mon Sep 17 00:00:00 2001 From: bashonly Date: Wed, 22 Nov 2023 09:49:19 -0600 Subject: [PATCH 5/7] [build] Lock updates for older versions of glibc Authored by: bashonly --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index daf5d2c12..03a254787 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -443,13 +443,17 @@ jobs: lock 2022.08.18.36 .+ Python 3\.6 lock 2023.11.16 (?!win_x86_exe).+ Python 3\.7 lock 2023.11.16 win_x86_exe .+ Windows-(?:Vista|2008Server) + lock 2023.11.16 linux_(?:armv7l|aarch64)_exe .+ glibc 2\.(?:[12]|30) lockV2 yt-dlp/yt-dlp 2022.08.18.36 .+ Python 3\.6 lockV2 yt-dlp/yt-dlp 2023.11.16 (?!win_x86_exe).+ Python 3\.7 lockV2 yt-dlp/yt-dlp 2023.11.16 win_x86_exe .+ Windows-(?:Vista|2008Server) + lockV2 yt-dlp/yt-dlp 2023.11.16 linux_(?:armv7l|aarch64)_exe .+ glibc 2\.(?:[12]|30) lockV2 yt-dlp/yt-dlp-nightly-builds 2023.11.15.232826 (?!win_x86_exe).+ Python 3\.7 lockV2 yt-dlp/yt-dlp-nightly-builds 2023.11.15.232826 win_x86_exe .+ Windows-(?:Vista|2008Server) lockV2 yt-dlp/yt-dlp-master-builds 2023.11.15.232812 (?!win_x86_exe).+ Python 3\.7 lockV2 yt-dlp/yt-dlp-master-builds 2023.11.15.232812 win_x86_exe .+ Windows-(?:Vista|2008Server) + lockV2 yt-dlp/yt-dlp-nightly-builds 2023.11.20.123456 linux_(?:armv7l|aarch64)_exe .+ glibc 2\.(?:[12]|30) + lockV2 yt-dlp/yt-dlp-master-builds 2023.11.20.987654 linux_(?:armv7l|aarch64)_exe .+ glibc 2\.(?:[12]|30) EOF - name: Sign checksum files From 15dbcbb9cbcb09b498f0ffb8c6f8fe8193e98795 Mon Sep 17 00:00:00 2001 From: bashonly Date: Wed, 22 Nov 2023 09:50:00 -0600 Subject: [PATCH 6/7] [update] Improve blocked update message Authored by: bashonly --- yt_dlp/update.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yt_dlp/update.py b/yt_dlp/update.py index f99583b08..eaaa4e2bd 100644 --- a/yt_dlp/update.py +++ b/yt_dlp/update.py @@ -334,7 +334,8 @@ class Updater: continue self._report_error( - f'yt-dlp cannot be updated to {resolved_tag} since you are on an older Python version', True) + f'yt-dlp cannot be updated to {resolved_tag} since you are on an older Python version ' + 'or your operating system is not compatible with the requested build', True) return None return resolved_tag From 124bdfcb188512ef78b7e1d21f51a160e9c7b041 Mon Sep 17 00:00:00 2001 From: bashonly <88596187+bashonly@users.noreply.github.com> Date: Mon, 12 Feb 2024 23:44:22 +0000 Subject: [PATCH 7/7] fix merge commit typos --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cc472d143..11a3e4974 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -204,9 +204,10 @@ jobs: apt -y install zlib1g-dev libffi-dev python3.8 python3.8-dev python3.8-distutils python3-pip \ python3-secretstorage # Cannot build cryptography wheel in virtual armv7 environment python3.8 -m pip install -U pip setuptools wheel - # XXX: Keep this in sync with pyproject.toml (it can't be accessed it this stage) and exclude secretstorage + # XXX: Keep this in sync with pyproject.toml (it can't be accessed at this stage) and exclude secretstorage python3.8 -m pip install -U Pyinstaller mutagen pycryptodomex websockets brotli certifi cffi \ 'requests>=2.31.0,<3' 'urllib3>=1.26.17,<3' 'websockets>=12.0' + run: | cd repo python3.8 devscripts/install_deps.py -o --include build