aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/build.yml555
-rw-r--r--.github/workflows/publish.yml80
-rw-r--r--.github/workflows/release-nightly.yml49
-rw-r--r--.github/workflows/release.yml125
-rw-r--r--Changelog.md8
-rw-r--r--README.md8
-rwxr-xr-xdevscripts/make_readme.py22
-rw-r--r--devscripts/update-version.py46
-rw-r--r--yt_dlp/YoutubeDL.py6
9 files changed, 559 insertions, 340 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6041376a4..2183903ea 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,393 +1,338 @@
-name: Build
-on: workflow_dispatch
+name: Build Artifacts
+on:
+ workflow_call:
+ inputs:
+ version:
+ required: true
+ type: string
+ channel:
+ required: false
+ default: stable
+ type: string
+ unix:
+ default: true
+ type: boolean
+ linux_arm:
+ default: true
+ type: boolean
+ macos:
+ default: true
+ type: boolean
+ macos_legacy:
+ default: true
+ type: boolean
+ windows:
+ default: true
+ type: boolean
+ windows32:
+ default: true
+ type: boolean
+ meta_files:
+ default: true
+ type: boolean
+
+ workflow_dispatch:
+ inputs:
+ version:
+ description: Version tag (YYYY.MM.DD[.REV])
+ required: true
+ type: string
+ channel:
+ description: Update channel (stable/nightly)
+ required: true
+ default: stable
+ type: string
+ unix:
+ description: yt-dlp, yt-dlp.tar.gz, yt-dlp_linux, yt-dlp_linux.zip
+ default: true
+ type: boolean
+ linux_arm:
+ description: yt-dlp_linux_aarch64, yt-dlp_linux_armv7l
+ default: true
+ type: boolean
+ macos:
+ description: yt-dlp_macos, yt-dlp_macos.zip
+ default: true
+ type: boolean
+ macos_legacy:
+ description: yt-dlp_macos_legacy
+ default: true
+ type: boolean
+ windows:
+ description: yt-dlp.exe, yt-dlp_min.exe, yt-dlp_win.zip
+ default: true
+ type: boolean
+ windows32:
+ description: yt-dlp_x86.exe
+ default: true
+ type: boolean
+ meta_files:
+ description: SHA2-256SUMS, SHA2-512SUMS, _update_spec
+ default: true
+ type: boolean
+
permissions:
contents: read
jobs:
- prepare:
- permissions:
- contents: write # for push_release
- runs-on: ubuntu-latest
- outputs:
- version_suffix: ${{ steps.version_suffix.outputs.version_suffix }}
- ytdlp_version: ${{ steps.bump_version.outputs.ytdlp_version }}
- head_sha: ${{ steps.push_release.outputs.head_sha }}
- steps:
- - uses: actions/checkout@v3
- with:
- fetch-depth: 0
- - uses: actions/setup-python@v4
- with:
- python-version: '3.10'
-
- - name: Set version suffix
- id: version_suffix
- env:
- PUSH_VERSION_COMMIT: ${{ secrets.PUSH_VERSION_COMMIT }}
- if: "env.PUSH_VERSION_COMMIT == ''"
- run: echo "version_suffix=$(date -u +"%H%M%S")" >> "$GITHUB_OUTPUT"
- - name: Bump version
- id: bump_version
- run: |
- python devscripts/update-version.py ${{ steps.version_suffix.outputs.version_suffix }}
- make issuetemplates
-
- - name: Push to release
- id: push_release
- run: |
- git config --global user.name github-actions
- git config --global user.email github-actions@example.com
- git add -u
- git commit -m "[version] update" -m "Created by: ${{ github.event.sender.login }}" -m ":ci skip all :ci run dl"
- git push origin --force ${{ github.event.ref }}:release
- echo "head_sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
- - name: Update master
- env:
- PUSH_VERSION_COMMIT: ${{ secrets.PUSH_VERSION_COMMIT }}
- if: "env.PUSH_VERSION_COMMIT != ''"
- run: git push origin ${{ github.event.ref }}
-
-
- build_unix:
- needs: prepare
+ unix:
+ if: inputs.unix
runs-on: ubuntu-latest
-
steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-python@v4
- with:
- python-version: '3.10'
- - uses: conda-incubator/setup-miniconda@v2
- with:
+ - uses: actions/checkout@v3
+ - uses: actions/setup-python@v4
+ with:
+ python-version: "3.10"
+ - uses: conda-incubator/setup-miniconda@v2
+ with:
miniforge-variant: Mambaforge
use-mamba: true
channels: conda-forge
auto-update-conda: true
- activate-environment: ''
+ activate-environment: ""
auto-activate-base: false
- - name: Install Requirements
- run: |
+ - name: Install Requirements
+ run: |
sudo apt-get -y install zip pandoc man sed
- python -m pip install -U pip setuptools wheel twine
+ python -m pip install -U pip setuptools wheel
python -m pip install -U Pyinstaller -r requirements.txt
reqs=$(mktemp)
echo -e 'python=3.10.*\npyinstaller' >$reqs
sed 's/^brotli.*/brotli-python/' <requirements.txt >>$reqs
mamba create -n build --file $reqs
- - name: Prepare
- run: |
- python devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
+ - name: Prepare
+ run: |
+ python devscripts/update-version.py -c ${{ inputs.channel }} ${{ inputs.version }}
python devscripts/make_lazy_extractors.py
- - name: Build Unix platform-independent binary
- run: |
+ - name: Build Unix platform-independent binary
+ run: |
make all tar
- - name: Build Unix standalone binary
- shell: bash -l {0}
- run: |
+ - name: Build Unix standalone binary
+ shell: bash -l {0}
+ run: |
unset LD_LIBRARY_PATH # Harmful; set by setup-python
conda activate build
python pyinst.py --onedir
(cd ./dist/yt-dlp_linux && zip -r ../yt-dlp_linux.zip .)
python pyinst.py
-
- - name: Upload artifacts
- uses: actions/upload-artifact@v3
- with:
- path: |
- yt-dlp
- yt-dlp.tar.gz
- dist/yt-dlp_linux
- dist/yt-dlp_linux.zip
-
- - name: Build and publish on PyPi
- env:
- TWINE_USERNAME: __token__
- TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
- if: "env.TWINE_PASSWORD != ''"
- run: |
- rm -rf dist/*
- python devscripts/set-variant.py pip -M "You installed yt-dlp with pip or using the wheel from PyPi; Use that to update"
- python setup.py sdist bdist_wheel
- twine upload dist/*
-
- - name: Install SSH private key for Homebrew
- env:
- BREW_TOKEN: ${{ secrets.BREW_TOKEN }}
- if: "env.BREW_TOKEN != ''"
- uses: yt-dlp/ssh-agent@v0.5.3
- with:
- ssh-private-key: ${{ env.BREW_TOKEN }}
- - name: Update Homebrew Formulae
- env:
- BREW_TOKEN: ${{ secrets.BREW_TOKEN }}
- if: "env.BREW_TOKEN != ''"
- run: |
- git clone git@github.com:yt-dlp/homebrew-taps taps/
- python devscripts/update-formulae.py taps/Formula/yt-dlp.rb "${{ needs.prepare.outputs.ytdlp_version }}"
- git -C taps/ config user.name github-actions
- git -C taps/ config user.email github-actions@example.com
- git -C taps/ commit -am 'yt-dlp: ${{ needs.prepare.outputs.ytdlp_version }}'
- git -C taps/ push
-
-
- build_linux_arm:
+ mv ./dist/yt-dlp_linux ./yt-dlp_linux
+ mv ./dist/yt-dlp_linux.zip ./yt-dlp_linux.zip
+
+ - name: Upload artifacts
+ uses: actions/upload-artifact@v3
+ with:
+ path: |
+ yt-dlp
+ yt-dlp.tar.gz
+ yt-dlp_linux
+ yt-dlp_linux.zip
+
+ linux_arm:
+ if: inputs.linux_arm
permissions:
- packages: write # for Creating cache
+ contents: read
+ packages: write # for creating cache
runs-on: ubuntu-latest
- needs: prepare
strategy:
matrix:
architecture:
- - armv7
- - aarch64
+ - armv7
+ - aarch64
steps:
- - uses: actions/checkout@v3
- with:
- path: ./repo
- - name: Virtualized Install, Prepare & Build
- uses: yt-dlp/run-on-arch-action@v2
- with:
- githubToken: ${{ github.token }} # To cache image
- arch: ${{ matrix.architecture }}
- distro: ubuntu18.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
- apt -y install zlib1g-dev python3.8 python3.8-dev python3.8-distutils python3-pip
- 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
-
- run: |
- cd repo
- python3.8 -m pip install -U Pyinstaller -r requirements.txt # Cached version may be out of date
- python3.8 devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
- python3.8 devscripts/make_lazy_extractors.py
- python3.8 pyinst.py
-
- - name: Upload artifacts
- uses: actions/upload-artifact@v3
- with:
- path: | # run-on-arch-action designates armv7l as armv7
- repo/dist/yt-dlp_linux_${{ (matrix.architecture == 'armv7' && 'armv7l') || matrix.architecture }}
-
-
- build_macos:
+ - uses: actions/checkout@v3
+ with:
+ path: ./repo
+ - name: Virtualized Install, Prepare & Build
+ uses: yt-dlp/run-on-arch-action@v2
+ with:
+ # Ref: https://github.com/uraimo/run-on-arch-action/issues/55
+ env: |
+ GITHUB_WORKFLOW: build
+ githubToken: ${{ github.token }} # To cache image
+ arch: ${{ matrix.architecture }}
+ distro: ubuntu18.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
+ apt -y install zlib1g-dev python3.8 python3.8-dev python3.8-distutils python3-pip
+ 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
+
+ run: |
+ cd repo
+ 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 }} ${{ inputs.version }}
+ python3.8 devscripts/make_lazy_extractors.py
+ python3.8 pyinst.py
+
+ - name: Upload artifacts
+ uses: actions/upload-artifact@v3
+ with:
+ path: | # run-on-arch-action designates armv7l as armv7
+ repo/dist/yt-dlp_linux_${{ (matrix.architecture == 'armv7' && 'armv7l') || matrix.architecture }}
+
+ macos:
+ if: inputs.macos
runs-on: macos-11
- needs: prepare
steps:
- - uses: actions/checkout@v3
- # NB: In order to create a universal2 application, the version of python3 in /usr/bin has to be used
- - name: Install Requirements
- run: |
+ - uses: actions/checkout@v3
+ # NB: In order to create a universal2 application, the version of python3 in /usr/bin has to be used
+ - name: Install Requirements
+ run: |
brew install coreutils
/usr/bin/python3 -m pip install -U --user pip Pyinstaller -r requirements.txt
- - name: Prepare
- run: |
- /usr/bin/python3 devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
+ - name: Prepare
+ run: |
+ /usr/bin/python3 devscripts/update-version.py -c ${{ inputs.channel }} ${{ inputs.version }}
/usr/bin/python3 devscripts/make_lazy_extractors.py
- - name: Build
- run: |
+ - name: Build
+ run: |
/usr/bin/python3 pyinst.py --target-architecture universal2 --onedir
(cd ./dist/yt-dlp_macos && zip -r ../yt-dlp_macos.zip .)
/usr/bin/python3 pyinst.py --target-architecture universal2
- - name: Upload artifacts
- uses: actions/upload-artifact@v3
- with:
- path: |
- dist/yt-dlp_macos
- dist/yt-dlp_macos.zip
+ - name: Upload artifacts
+ uses: actions/upload-artifact@v3
+ with:
+ path: |
+ dist/yt-dlp_macos
+ dist/yt-dlp_macos.zip
-
- build_macos_legacy:
+ macos_legacy:
+ if: inputs.macos_legacy
runs-on: macos-latest
- needs: prepare
steps:
- - uses: actions/checkout@v3
- - name: Install Python
- # We need the official Python, because the GA ones only support newer macOS versions
- env:
- PYTHON_VERSION: 3.10.5
- MACOSX_DEPLOYMENT_TARGET: 10.9 # Used up by the Python build tools
- run: |
+ - uses: actions/checkout@v3
+ - name: Install Python
+ # We need the official Python, because the GA ones only support newer macOS versions
+ env:
+ PYTHON_VERSION: 3.10.5
+ MACOSX_DEPLOYMENT_TARGET: 10.9 # Used up by the Python build tools
+ run: |
# Hack to get the latest patch version. Uncomment if needed
#brew install python@3.10
#export PYTHON_VERSION=$( $(brew --prefix)/opt/python@3.10/bin/python3 --version | cut -d ' ' -f 2 )
curl https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-macos11.pkg -o "python.pkg"
sudo installer -pkg python.pkg -target /
python3 --version
- - name: Install Requirements
- run: |
+ - name: Install Requirements
+ run: |
brew install coreutils
python3 -m pip install -U --user pip Pyinstaller -r requirements.txt
- - name: Prepare
- run: |
- python3 devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
+ - name: Prepare
+ run: |
+ python3 devscripts/update-version.py -c ${{ inputs.channel }} ${{ inputs.version }}
python3 devscripts/make_lazy_extractors.py
- - name: Build
- run: |
+ - name: Build
+ run: |
python3 pyinst.py
mv dist/yt-dlp_macos dist/yt-dlp_macos_legacy
- - name: Upload artifacts
- uses: actions/upload-artifact@v3
- with:
- path: |
- dist/yt-dlp_macos_legacy
-
+ - name: Upload artifacts
+ uses: actions/upload-artifact@v3
+ with:
+ path: |
+ dist/yt-dlp_macos_legacy
- build_windows:
+ windows:
+ if: inputs.windows
runs-on: windows-latest
- needs: prepare
steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-python@v4
- with: # 3.8 is used for Win7 support
- python-version: '3.8'
- - name: Install Requirements
- run: | # Custom pyinstaller built with https://github.com/yt-dlp/pyinstaller-builds
+ - uses: actions/checkout@v3
+ - uses: actions/setup-python@v4
+ with: # 3.8 is used for Win7 support
+ python-version: "3.8"
+ - name: Install Requirements
+ run: | # Custom pyinstaller built with https://github.com/yt-dlp/pyinstaller-builds
python -m pip install -U pip setuptools wheel py2exe
pip install -U "https://yt-dlp.github.io/Pyinstaller-Builds/x86_64/pyinstaller-5.8.0-py3-none-any.whl" -r requirements.txt
- - name: Prepare
- run: |
- python devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
+ - name: Prepare
+ run: |
+ python devscripts/update-version.py -c ${{ inputs.channel }} ${{ inputs.version }}
python devscripts/make_lazy_extractors.py
- - name: Build
- run: |
+ - name: Build
+ run: |
python setup.py py2exe
Move-Item ./dist/yt-dlp.exe ./dist/yt-dlp_min.exe
python pyinst.py
python pyinst.py --onedir
Compress-Archive -Path ./dist/yt-dlp/* -DestinationPath ./dist/yt-dlp_win.zip
- - name: Upload artifacts
- uses: actions/upload-artifact@v3
- with:
- path: |
- dist/yt-dlp.exe
- dist/yt-dlp_min.exe
- dist/yt-dlp_win.zip
-
+ - name: Upload artifacts
+ uses: actions/upload-artifact@v3
+ with:
+ path: |
+ dist/yt-dlp.exe
+ dist/yt-dlp_min.exe
+ dist/yt-dlp_win.zip
- build_windows32:
+ windows32:
+ if: inputs.windows32
runs-on: windows-latest
- needs: prepare
steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-python@v4
- with: # 3.7 is used for Vista support. See https://github.com/yt-dlp/yt-dlp/issues/390
- python-version: '3.7'
- architecture: 'x86'
- - name: Install Requirements
- run: |
+ - uses: actions/checkout@v3
+ - uses: actions/setup-python@v4
+ with: # 3.7 is used for Vista support. See https://github.com/yt-dlp/yt-dlp/issues/390
+ python-version: "3.7"
+ architecture: "x86"
+ - name: Install Requirements
+ run: |
python -m pip install -U pip setuptools wheel
pip install -U "https://yt-dlp.github.io/Pyinstaller-Builds/i686/pyinstaller-5.8.0-py3-none-any.whl" -r requirements.txt
- - name: Prepare
- run: |
- python devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
+ - name: Prepare
+ run: |
+ python devscripts/update-version.py -c ${{ inputs.channel }} ${{ inputs.version }}
python devscripts/make_lazy_extractors.py
- - name: Build
- run: |
+ - name: Build
+ run: |
python pyinst.py
- - name: Upload artifacts
- uses: actions/upload-artifact@v3
- with:
- path: |
- dist/yt-dlp_x86.exe
-
-
- publish_release:
- permissions:
- contents: write # for action-gh-release
+ - name: Upload artifacts
+ uses: actions/upload-artifact@v3
+ with:
+ path: |
+ dist/yt-dlp_x86.exe
+
+ meta_files:
+ if: inputs.meta_files && always()
+ needs:
+ - unix
+ - linux_arm
+ - macos
+ - macos_legacy
+ - windows
+ - windows32
runs-on: ubuntu-latest
- needs: [prepare, build_unix, build_linux_arm, build_windows, build_windows32, build_macos, build_macos_legacy]
-
steps:
- - uses: actions/checkout@v3
- - uses: actions/download-artifact@v3
-
- - name: Get Changelog
- run: |
- changelog=$(grep -oPz '(?s)(?<=### ${{ needs.prepare.outputs.ytdlp_version }}\n{2}).+?(?=\n{2,3}###)' Changelog.md) || true
- echo "changelog<<EOF" >> $GITHUB_ENV
- echo "$changelog" >> $GITHUB_ENV
- echo "EOF" >> $GITHUB_ENV
- - name: Make Update spec
- run: |
- echo "# This file is used for regulating self-update" >> _update_spec
- echo "lock 2022.07.18 .+ Python 3.6" >> _update_spec
- - name: Make SHA2-SUMS files
- run: |
- sha256sum artifact/yt-dlp | awk '{print $1 " yt-dlp"}' >> SHA2-256SUMS
- sha256sum artifact/yt-dlp.tar.gz | awk '{print $1 " yt-dlp.tar.gz"}' >> SHA2-256SUMS
- sha256sum artifact/yt-dlp.exe | awk '{print $1 " yt-dlp.exe"}' >> SHA2-256SUMS
- sha256sum artifact/yt-dlp_win.zip | awk '{print $1 " yt-dlp_win.zip"}' >> SHA2-256SUMS
- sha256sum artifact/yt-dlp_min.exe | awk '{print $1 " yt-dlp_min.exe"}' >> SHA2-256SUMS
- sha256sum artifact/yt-dlp_x86.exe | awk '{print $1 " yt-dlp_x86.exe"}' >> SHA2-256SUMS
- sha256sum artifact/yt-dlp_macos | awk '{print $1 " yt-dlp_macos"}' >> SHA2-256SUMS
- sha256sum artifact/yt-dlp_macos.zip | awk '{print $1 " yt-dlp_macos.zip"}' >> SHA2-256SUMS
- sha256sum artifact/yt-dlp_macos_legacy | awk '{print $1 " yt-dlp_macos_legacy"}' >> SHA2-256SUMS
- sha256sum artifact/yt-dlp_linux_armv7l | awk '{print $1 " yt-dlp_linux_armv7l"}' >> SHA2-256SUMS
- sha256sum artifact/yt-dlp_linux_aarch64 | awk '{print $1 " yt-dlp_linux_aarch64"}' >> SHA2-256SUMS
- sha256sum artifact/dist/yt-dlp_linux | awk '{print $1 " yt-dlp_linux"}' >> SHA2-256SUMS
- sha256sum artifact/dist/yt-dlp_linux.zip | awk '{print $1 " yt-dlp_linux.zip"}' >> SHA2-256SUMS
- sha512sum artifact/yt-dlp | awk '{print $1 " yt-dlp"}' >> SHA2-512SUMS
- sha512sum artifact/yt-dlp.tar.gz | awk '{print $1 " yt-dlp.tar.gz"}' >> SHA2-512SUMS
- sha512sum artifact/yt-dlp.exe | awk '{print $1 " yt-dlp.exe"}' >> SHA2-512SUMS
- sha512sum artifact/yt-dlp_win.zip | awk '{print $1 " yt-dlp_win.zip"}' >> SHA2-512SUMS
- sha512sum artifact/yt-dlp_min.exe | awk '{print $1 " yt-dlp_min.exe"}' >> SHA2-512SUMS
- sha512sum artifact/yt-dlp_x86.exe | awk '{print $1 " yt-dlp_x86.exe"}' >> SHA2-512SUMS
- sha512sum artifact/yt-dlp_macos | awk '{print $1 " yt-dlp_macos"}' >> SHA2-512SUMS
- sha512sum artifact/yt-dlp_macos.zip | awk '{print $1 " yt-dlp_macos.zip"}' >> SHA2-512SUMS
- sha512sum artifact/yt-dlp_macos_legacy | awk '{print $1 " yt-dlp_macos_legacy"}' >> SHA2-512SUMS
- sha512sum artifact/yt-dlp_linux_armv7l | awk '{print $1 " yt-dlp_linux_armv7l"}' >> SHA2-512SUMS
- sha512sum artifact/yt-dlp_linux_aarch64 | awk '{print $1 " yt-dlp_linux_aarch64"}' >> SHA2-512SUMS
- sha512sum artifact/dist/yt-dlp_linux | awk '{print $1 " yt-dlp_linux"}' >> SHA2-512SUMS
- sha512sum artifact/dist/yt-dlp_linux.zip | awk '{print $1 " yt-dlp_linux.zip"}' >> SHA2-512SUMS
-
- - name: Publish Release
- uses: yt-dlp/action-gh-release@v1
- with:
- tag_name: ${{ needs.prepare.outputs.ytdlp_version }}
- name: yt-dlp ${{ needs.prepare.outputs.ytdlp_version }}
- target_commitish: ${{ needs.prepare.outputs.head_sha }}
- body: |
- #### [A description of the various files]((https://github.com/yt-dlp/yt-dlp#release-files)) are in the README
+ - uses: actions/download-artifact@v3
- ---
- <details open><summary><h3>Changelog</summary>
- <p>
-
- ${{ env.changelog }}
+ - name: Make SHA2-SUMS files
+ run: |
+ cd ./artifact/
+ sha256sum * > ../SHA2-256SUMS
+ sha512sum * > ../SHA2-512SUMS
- </p>
- </details>
- files: |
- SHA2-256SUMS
- SHA2-512SUMS
- artifact/yt-dlp
- artifact/yt-dlp.tar.gz
- artifact/yt-dlp.exe
- artifact/yt-dlp_win.zip
- artifact/yt-dlp_min.exe
- artifact/yt-dlp_x86.exe
- artifact/yt-dlp_macos
- artifact/yt-dlp_macos.zip
- artifact/yt-dlp_macos_legacy
- artifact/yt-dlp_linux_armv7l
- artifact/yt-dlp_linux_aarch64
- artifact/dist/yt-dlp_linux
- artifact/dist/yt-dlp_linux.zip
- _update_spec
+ - name: Make Update spec
+ run: |
+ cat >> _update_spec << EOF
+ # This file is used for regulating self-update
+ lock 2022.08.18.36 .+ Python 3.6
+ EOF
+
+ - name: Upload artifacts
+ uses: actions/upload-artifact@v3
+ with:
+ path: |
+ SHA*SUMS*
+ _update_spec
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
new file mode 100644
index 000000000..42e66a29c
--- /dev/null
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,80 @@
+name: Publish
+on:
+ workflow_call:
+ inputs:
+ nightly:
+ default: false
+ required: false
+ type: boolean
+ version:
+ required: true
+ type: string
+ target_commitish:
+ required: true
+ type: string
+ secrets:
+ ARCHIVE_REPO_TOKEN:
+ required: false
+
+permissions:
+ contents: write
+
+jobs:
+ publish:
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+ - uses: actions/download-artifact@v3
+ - uses: actions/setup-python@v4
+ with:
+ python-version: "3.10"
+
+ - name: Generate release notes
+ run: |
+ cat >> ./RELEASE_NOTES << EOF
+ #### A description of the various files are in the [README](https://github.com/yt-dlp/yt-dlp#release-files)
+ ---
+ <details><summary><h3>Changelog</h3></summary>
+ $(python ./devscripts/make_changelog.py -vv)
+ </details>
+ EOF
+ echo "**This is an automated nightly pre-release build**" >> ./PRERELEASE_NOTES
+ cat ./RELEASE_NOTES >> ./PRERELEASE_NOTES
+ echo "Generated from: https://github.com/${{ github.repository }}/commit/${{ inputs.target_commitish }}" >> ./ARCHIVE_NOTES
+ cat ./RELEASE_NOTES >> ./ARCHIVE_NOTES
+
+ - name: Archive nightly release
+ env:
+ GH_TOKEN: ${{ secrets.ARCHIVE_REPO_TOKEN }}
+ GH_REPO: ${{ vars.ARCHIVE_REPO }}
+ if: |
+ inputs.nightly && env.GH_TOKEN != '' && env.GH_REPO != ''
+ run: |
+ gh release create \
+ --notes-file ARCHIVE_NOTES \
+ --title "Build ${{ inputs.version }}" \
+ ${{ inputs.version }} \
+ artifact/*
+
+ - name: Prune old nightly release
+ if: inputs.nightly
+ env:
+ GH_TOKEN: ${{ github.token }}
+ run: |
+ gh release delete --yes --cleanup-tag "nightly" || true
+ git tag --delete "nightly" || true
+ sleep 5 # Enough time to cover deletion race condition
+
+ - name: Publish release${{ inputs.nightly && ' (nightly)' || '' }}
+ env:
+ GH_TOKEN: ${{ github.token }}
+ run: |
+ gh release create \
+ --notes-file ${{ inputs.nightly && 'PRE' || '' }}RELEASE_NOTES \
+ --target ${{ inputs.target_commitish }} \
+ --title "yt-dlp ${{ inputs.nightly && 'nightly ' || '' }}${{ inputs.version }}" \
+ ${{ inputs.nightly && '--prerelease "nightly"' || inputs.version }} \
+ artifact/*
diff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml
new file mode 100644
index 000000000..ec079b8d0
--- /dev/null
+++ b/.github/workflows/release-nightly.yml
@@ -0,0 +1,49 @@
+name: Release (nightly)
+on:
+ push:
+ branches:
+ - master
+ paths:
+ - "**.py"
+ - "!yt_dlp/version.py"
+concurrency:
+ group: release-nightly
+ cancel-in-progress: true
+permissions:
+ contents: read
+
+jobs:
+ prepare:
+ if: vars.BUILD_NIGHTLY != ''
+ runs-on: ubuntu-latest
+ outputs:
+ version: ${{ steps.get_version.outputs.version }}
+
+ steps:
+ - uses: actions/checkout@v3
+ - name: Get version
+ id: get_version
+ run: |
+ python devscripts/update-version.py "$(date -u +"%H%M%S")" | grep -Po "version=\d+(\.\d+){3}" >> "$GITHUB_OUTPUT"
+
+ build:
+ needs: prepare
+ uses: ./.github/workflows/build.yml
+ with:
+ version: ${{ needs.prepare.outputs.version }}
+ channel: nightly
+ permissions:
+ contents: read
+ packages: write # For package cache
+
+ publish:
+ needs: [prepare, build]
+ uses: ./.github/workflows/publish.yml
+ secrets:
+ ARCHIVE_REPO_TOKEN: ${{ secrets.ARCHIVE_REPO_TOKEN }}
+ permissions:
+ contents: write
+ with:
+ nightly: true
+ version: ${{ needs.prepare.outputs.version }}
+ target_commitish: ${{ github.sha }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 000000000..c97cd1f4a
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,125 @@
+name: Release
+on: workflow_dispatch
+permissions:
+ contents: read
+
+jobs:
+ prepare:
+ permissions:
+ contents: write
+ runs-on: ubuntu-latest
+ outputs:
+ version: ${{ steps.update_version.outputs.version }}
+ head_sha: ${{ steps.push_release.outputs.head_sha }}
+
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+
+ - uses: actions/setup-python@v4
+ with:
+ python-version: "3.10"
+
+ - name: Update version
+ id: update_version
+ run: |
+ python devscripts/update-version.py ${{ vars.PUSH_VERSION_COMMIT == '' && '"$(date -u +"%H%M%S")"' || '' }} | \
+ grep -Po "version=\d+\.\d+\.\d+(\.\d+)?" >> "$GITHUB_OUTPUT"
+
+ - name: Update documentation
+ run: |
+ make doc
+ sed '/### /Q' Changelog.md >> ./CHANGELOG
+ echo '### ${{ steps.update_version.outputs.version }}' >> ./CHANGELOG
+ python ./devscripts/make_changelog.py -vv -c >> ./CHANGELOG
+ echo >> ./CHANGELOG
+ grep -Poz '(?s)### \d+\.\d+\.\d+.+' 'Changelog.md' | head -n -1 >> ./CHANGELOG
+ cat ./CHANGELOG > Changelog.md
+
+ - name: Push to release
+ id: push_release
+ run: |
+ git config --global user.name github-actions
+ git config --global user.email github-actions@example.com
+ git add -u
+ git commit -m "Release ${{ steps.update_version.outputs.version }}" \
+ -m "Created by: ${{ github.event.sender.login }}" -m ":ci skip all :ci run dl"
+ git push origin --force ${{ github.event.ref }}:release
+ echo "head_sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
+
+ - name: Update master
+ if: vars.PUSH_VERSION_COMMIT != ''
+ run: git push origin ${{ github.event.ref }}
+
+ publish_pypi_homebrew:
+ needs: prepare
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v3
+ - uses: actions/setup-python@v4
+ with:
+ python-version: "3.10"
+
+ - name: Install Requirements
+ run: |
+ python -m pip install -U pip setuptools wheel twine
+ python -m pip install -U -r requirements.txt
+
+ - name: Prepare
+ run: |
+ python devscripts/update-version.py ${{ needs.prepare.outputs.version }}
+ python devscripts/make_lazy_extractors.py
+
+ - name: Build and publish on PyPI
+ env:
+ TWINE_USERNAME: __token__
+ TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+ if: env.TWINE_PASSWORD != ''
+ run: |
+ rm -rf dist/*
+ python devscripts/set-variant.py pip -M "You installed yt-dlp with pip or using the wheel from PyPi; Use that to update"
+ python setup.py sdist bdist_wheel
+ twine upload dist/*
+
+ - name: Checkout Homebrew repository
+ env:
+ BREW_TOKEN: ${{ secrets.BREW_TOKEN }}
+ PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
+ if: env.BREW_TOKEN != '' && env.PYPI_TOKEN != ''
+ uses: actions/checkout@v3
+ with:
+ repository: yt-dlp/homebrew-taps
+ path: taps
+ ssh-key: ${{ secrets.BREW_TOKEN }}
+
+ - name: Update Homebrew Formulae
+ env:
+ BREW_TOKEN: ${{ secrets.BREW_TOKEN }}
+ PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
+ if: env.BREW_TOKEN != '' && env.PYPI_TOKEN != ''
+ run: |
+ python devscripts/update-formulae.py taps/Formula/yt-dlp.rb "${{ needs.prepare.outputs.version }}"
+ git -C taps/ config user.name github-actions
+ git -C taps/ config user.email github-actions@example.com
+ git -C taps/ commit -am 'yt-dlp: ${{ needs.prepare.outputs.version }}'
+ git -C taps/ push
+
+ build:
+ needs: prepare
+ uses: ./.github/workflows/build.yml
+ with:
+ version: ${{ needs.prepare.outputs.version }}
+ permissions:
+ contents: read
+ packages: write # For package cache
+
+ publish:
+ needs: [prepare, build]
+ uses: ./.github/workflows/publish.yml
+ permissions:
+ contents: write
+ with:
+ version: ${{ needs.prepare.outputs.version }}
+ target_commitish: ${{ needs.prepare.outputs.head_sha }}
diff --git a/Changelog.md b/Changelog.md
index 24bc8a2e2..60bd99f72 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,13 +1,7 @@
# Changelog
<!--
-# Instuctions for creating release
-
-* Run `make doc`
-* Update Changelog.md and CONTRIBUTORS
-* Change "Based on ytdl" version in Readme.md if needed
-* Commit as `Release <version>` and push to master
-* Dispatch the workflow https://github.com/yt-dlp/yt-dlp/actions/workflows/build.yml on master
+# To create a release, dispatch the https://github.com/yt-dlp/yt-dlp/actions/workflows/release.yml workflow on master
-->
### 2023.02.17
diff --git a/README.md b/README.md
index ddd71eeeb..e6e95b147 100644
--- a/README.md
+++ b/README.md
@@ -318,7 +318,8 @@ If you wish to build it anyway, install Python and py2exe, and then simply run `
Note: See their `--help` for more info.
-You can also fork the project on GitHub and run your fork's [build workflow](.github/workflows/build.yml) to automatically build a full release
+### Forking the project
+If you fork the project on GitHub, you can run your fork's [build workflow](.github/workflows/build.yml) to automatically build the selected version(s) as artifacts. Alternatively, you can run the [release workflow](.github/workflows/release.yml) or enable the [nightly workflow](.github/workflows/release-nightly.yml) to create full (pre-)releases.
# USAGE AND OPTIONS
@@ -460,9 +461,8 @@ You can also fork the project on GitHub and run your fork's [build workflow](.gi
--date DATE Download only videos uploaded on this date.
The date can be "YYYYMMDD" or in the format
[now|today|yesterday][-N[day|week|month|year]].
- E.g. "--date today-2weeks" downloads
- only videos uploaded on the same day two
- weeks ago
+ E.g. "--date today-2weeks" downloads only
+ videos uploaded on the same day two weeks ago
--datebefore DATE Download only videos uploaded on or before
this date. The date formats accepted is the
same as --date
diff --git a/devscripts/make_readme.py b/devscripts/make_readme.py
index fad993a19..2270b31d3 100755
--- a/devscripts/make_readme.py
+++ b/devscripts/make_readme.py
@@ -45,33 +45,43 @@ switch_col_width = len(re.search(r'(?m)^\s{5,}', options).group())
delim = f'\n{" " * switch_col_width}'
PATCHES = (
- ( # Standardize update message
+ ( # Standardize `--update` message
r'(?m)^( -U, --update\s+).+(\n \s.+)*$',
r'\1Update this program to the latest version',
),
- ( # Headings
+ ( # Headings
r'(?m)^ (\w.+\n)( (?=\w))?',
r'## \1'
),
- ( # Do not split URLs
+ ( # Fixup `--date` formatting
+ rf'(?m)( --date DATE.+({delim}[^\[]+)*)\[.+({delim}.+)*$',
+ (rf'\1[now|today|yesterday][-N[day|week|month|year]].{delim}'
+ f'E.g. "--date today-2weeks" downloads only{delim}'
+ 'videos uploaded on the same day two weeks ago'),
+ ),
+ ( # Do not split URLs
rf'({delim[:-1]})? (?P<label>\[\S+\] )?(?P<url>https?({delim})?:({delim})?/({delim})?/(({delim})?\S+)+)\s',
lambda mobj: ''.join((delim, mobj.group('label') or '', re.sub(r'\s+', '', mobj.group('url')), '\n'))
),
- ( # Do not split "words"
+ ( # Do not split "words"
rf'(?m)({delim}\S+)+$',
lambda mobj: ''.join((delim, mobj.group(0).replace(delim, '')))
),
- ( # Allow overshooting last line
+ ( # Allow overshooting last line
rf'(?m)^(?P<prev>.+)${delim}(?P<current>.+)$(?!{delim})',
lambda mobj: (mobj.group().replace(delim, ' ')
if len(mobj.group()) - len(delim) + 1 <= max_width + ALLOWED_OVERSHOOT
else mobj.group())
),
- ( # Avoid newline when a space is available b/w switch and description
+ ( # Avoid newline when a space is available b/w switch and description
DISABLE_PATCH, # This creates issues with prepare_manpage
r'(?m)^(\s{4}-.{%d})(%s)' % (switch_col_width - 6, delim),
r'\1 '
),
+ ( # Replace brackets with a Markdown link
+ r'SponsorBlock API \((http.+)\)',
+ r'[SponsorBlock API](\1)'
+ ),
)
readme = read_file(README_FILE)
diff --git a/devscripts/update-version.py b/devscripts/update-version.py
index 9cf8b42e6..00c2d54cf 100644
--- a/devscripts/update-version.py
+++ b/devscripts/update-version.py
@@ -7,6 +7,7 @@ import sys
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+import argparse
import contextlib
import subprocess
import sys
@@ -15,8 +16,9 @@ from datetime import datetime
from devscripts.utils import read_version, write_file
-def get_new_version(revision):
- version = datetime.utcnow().strftime('%Y.%m.%d')
+def get_new_version(version, revision):
+ if not version:
+ version = datetime.utcnow().strftime('%Y.%m.%d')
if revision:
assert revision.isdigit(), 'Revision must be a number'
@@ -30,27 +32,41 @@ def get_new_version(revision):
def get_git_head():
with contextlib.suppress(Exception):
- sp = subprocess.Popen(['git', 'rev-parse', '--short', 'HEAD'], stdout=subprocess.PIPE)
- return sp.communicate()[0].decode().strip() or None
+ return subprocess.check_output(['git', 'rev-parse', 'HEAD'], text=True).strip() or None
-VERSION = get_new_version((sys.argv + [''])[1])
-GIT_HEAD = get_git_head()
-
-VERSION_FILE = f'''\
+VERSION_TEMPLATE = '''\
# Autogenerated by devscripts/update-version.py
-__version__ = {VERSION!r}
+__version__ = {version!r}
-RELEASE_GIT_HEAD = {GIT_HEAD!r}
+RELEASE_GIT_HEAD = {git_head!r}
VARIANT = None
UPDATE_HINT = None
+
+CHANNEL = "{channel!r}"
'''
-write_file('yt_dlp/version.py', VERSION_FILE)
-github_output = os.getenv('GITHUB_OUTPUT')
-if github_output:
- write_file(github_output, f'ytdlp_version={VERSION}\n', 'a')
-print(f'\nVersion = {VERSION}, Git HEAD = {GIT_HEAD}')
+if __name__ == '__main__':
+ parser = argparse.ArgumentParser(description='Update the version.py file')
+ parser.add_argument(
+ '-c', '--channel', choices=['stable', 'nightly'], default='stable',
+ help='Select update channel (default: %(default)s)')
+ parser.add_argument(
+ '-o', '--output', default='yt_dlp/version.py',
+ help='The output file to write to (default: %(default)s)')
+ parser.add_argument(
+ 'version', nargs='?', default=None,
+ help='A version or revision to use instead of generating one')
+ args = parser.parse_args()
+
+ git_head = get_git_head()
+ version = (
+ args.version if args.version and '.' in args.version
+ else get_new_version(None, args.version))
+ write_file(args.output, VERSION_TEMPLATE.format(
+ version=version, git_head=git_head, channel=args.channel))
+
+ print(f'version={version} ({args.channel}), head={git_head}')
diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py
index 00846cd7e..1b77e12b8 100644
--- a/yt_dlp/YoutubeDL.py
+++ b/yt_dlp/YoutubeDL.py
@@ -150,7 +150,7 @@ from .utils import (
write_json_file,
write_string,
)
-from .version import RELEASE_GIT_HEAD, VARIANT, __version__
+from .version import CHANNEL, RELEASE_GIT_HEAD, VARIANT, __version__
if compat_os_name == 'nt':
import ctypes
@@ -3768,8 +3768,8 @@ class YoutubeDL:
klass = type(self)
write_debug(join_nonempty(
f'{"yt-dlp" if REPOSITORY == "yt-dlp/yt-dlp" else REPOSITORY} version',
- __version__,
- f'[{RELEASE_GIT_HEAD}]' if RELEASE_GIT_HEAD else '',
+ __version__ + {'stable': '', 'nightly': '*'}.get(CHANNEL, f' <{CHANNEL}>'),
+ f'[{RELEASE_GIT_HEAD[:9]}]' if RELEASE_GIT_HEAD else '',
'' if source == 'unknown' else f'({source})',
'' if _IN_CLI else 'API' if klass == YoutubeDL else f'API:{self.__module__}.{klass.__qualname__}',
delim=' '))