summaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/build.yml78
-rw-r--r--.github/workflows/release-master.yml3
-rw-r--r--.github/workflows/release-nightly.yml3
-rw-r--r--.github/workflows/release.yml3
4 files changed, 71 insertions, 16 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 55cf3b3..12ec5b0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -237,34 +237,63 @@ jobs:
macos:
needs: process
if: inputs.macos
- runs-on: macos-11
+ permissions:
+ contents: read
+ actions: write # For cleaning up cache
+ runs-on: macos-12
steps:
- uses: actions/checkout@v4
# NB: Building universal2 does not work with python from actions/setup-python
+
+ - name: Restore cached requirements
+ id: restore-cache
+ uses: actions/cache/restore@v4
+ env:
+ SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
+ with:
+ path: |
+ ~/yt-dlp-build-venv
+ key: cache-reqs-${{ github.job }}
+
- name: Install Requirements
run: |
brew install coreutils
- python3 devscripts/install_deps.py --user -o --include build
+ python3 -m venv ~/yt-dlp-build-venv
+ source ~/yt-dlp-build-venv/bin/activate
+ python3 devscripts/install_deps.py -o --include build
python3 devscripts/install_deps.py --print --include pyinstaller > requirements.txt
# We need to ignore wheels otherwise we break universal2 builds
- python3 -m pip install -U --user --no-binary :all: -r requirements.txt
+ python3 -m pip install -U --no-binary :all: -r requirements.txt
# We need to fuse our own universal2 wheels for curl_cffi
- python3 -m pip install -U --user delocate
+ python3 -m pip install -U delocate
mkdir curl_cffi_whls curl_cffi_universal2
python3 devscripts/install_deps.py --print -o --include curl-cffi > requirements.txt
for platform in "macosx_11_0_arm64" "macosx_11_0_x86_64"; do
python3 -m pip download \
--only-binary=:all: \
--platform "${platform}" \
- --pre -d curl_cffi_whls \
+ -d curl_cffi_whls \
-r requirements.txt
done
+ ( # Overwrite x86_64-only libs with fat/universal2 libs or else Pyinstaller will do the opposite
+ # See https://github.com/yt-dlp/yt-dlp/pull/10069
+ cd curl_cffi_whls
+ mkdir -p curl_cffi/.dylibs
+ python_libdir=$(python3 -c 'import sys; from pathlib import Path; print(Path(sys.path[1]).parent)')
+ for dylib in lib{ssl,crypto}.3.dylib; do
+ cp "${python_libdir}/${dylib}" "curl_cffi/.dylibs/${dylib}"
+ for wheel in curl_cffi*macos*x86_64.whl; do
+ zip "${wheel}" "curl_cffi/.dylibs/${dylib}"
+ done
+ done
+ )
python3 -m delocate.cmd.delocate_fuse curl_cffi_whls/curl_cffi*.whl -w curl_cffi_universal2
python3 -m delocate.cmd.delocate_fuse curl_cffi_whls/cffi*.whl -w curl_cffi_universal2
- cd curl_cffi_universal2
- for wheel in *cffi*.whl; do mv -n -- "${wheel}" "${wheel/x86_64/universal2}"; done
- python3 -m pip install -U --user *cffi*.whl
+ for wheel in curl_cffi_universal2/*cffi*.whl; do
+ mv -n -- "${wheel}" "${wheel/x86_64/universal2}"
+ done
+ python3 -m pip install --force-reinstall -U curl_cffi_universal2/*cffi*.whl
- name: Prepare
run: |
@@ -272,6 +301,7 @@ jobs:
python3 devscripts/make_lazy_extractors.py
- name: Build
run: |
+ source ~/yt-dlp-build-venv/bin/activate
python3 -m bundle.pyinstaller --target-architecture universal2 --onedir
(cd ./dist/yt-dlp_macos && zip -r ../yt-dlp_macos.zip .)
python3 -m bundle.pyinstaller --target-architecture universal2
@@ -295,6 +325,24 @@ jobs:
dist/yt-dlp_macos.zip
compression-level: 0
+ - name: Cleanup cache
+ if: steps.restore-cache.outputs.cache-hit == 'true'
+ env:
+ GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ cache_key: cache-reqs-${{ github.job }}
+ repository: ${{ github.repository }}
+ branch: ${{ github.ref }}
+ run: |
+ gh extension install actions/gh-actions-cache
+ gh actions-cache delete "${cache_key}" -R "${repository}" -B "${branch}" --confirm
+
+ - name: Cache requirements
+ uses: actions/cache/save@v4
+ with:
+ path: |
+ ~/yt-dlp-build-venv
+ key: cache-reqs-${{ github.job }}
+
macos_legacy:
needs: process
if: inputs.macos_legacy
@@ -311,7 +359,7 @@ jobs:
# 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"
+ 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
@@ -361,7 +409,7 @@ jobs:
run: | # Custom pyinstaller built with https://github.com/yt-dlp/pyinstaller-builds
python devscripts/install_deps.py -o --include build
python devscripts/install_deps.py --include curl-cffi
- python -m pip install -U "https://yt-dlp.github.io/Pyinstaller-Builds/x86_64/pyinstaller-5.8.0-py3-none-any.whl"
+ python -m pip install -U "https://yt-dlp.github.io/Pyinstaller-Builds/x86_64/pyinstaller-6.7.0-py3-none-any.whl"
- name: Prepare
run: |
@@ -421,7 +469,7 @@ jobs:
run: |
python devscripts/install_deps.py -o --include build
python devscripts/install_deps.py
- python -m pip install -U "https://yt-dlp.github.io/Pyinstaller-Builds/i686/pyinstaller-5.8.0-py3-none-any.whl"
+ python -m pip install -U "https://yt-dlp.github.io/Pyinstaller-Builds/i686/pyinstaller-6.7.0-py3-none-any.whl"
- name: Prepare
run: |
@@ -475,8 +523,12 @@ jobs:
run: |
cd ./artifact/
# make sure SHA sums are also printed to stdout
- sha256sum * | tee ../SHA2-256SUMS
- sha512sum * | tee ../SHA2-512SUMS
+ sha256sum -- * | tee ../SHA2-256SUMS
+ sha512sum -- * | tee ../SHA2-512SUMS
+ # also print as permanent annotations to the summary page
+ while read -r shasum; do
+ echo "::notice title=${shasum##* }::sha256: ${shasum% *}"
+ done < ../SHA2-256SUMS
- name: Make Update spec
run: |
diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml
index a845475..c49319b 100644
--- a/.github/workflows/release-master.yml
+++ b/.github/workflows/release-master.yml
@@ -24,6 +24,7 @@ jobs:
source: master
permissions:
contents: write
- packages: write
+ packages: write # For package cache
+ actions: write # For cleaning up cache
id-token: write # mandatory for trusted publishing
secrets: inherit
diff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml
index f459a3a..b536c50 100644
--- a/.github/workflows/release-nightly.yml
+++ b/.github/workflows/release-nightly.yml
@@ -37,6 +37,7 @@ jobs:
source: nightly
permissions:
contents: write
- packages: write
+ packages: write # For package cache
+ actions: write # For cleaning up cache
id-token: write # mandatory for trusted publishing
secrets: inherit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 32268b3..fa5ad7e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -228,7 +228,8 @@ jobs:
origin: ${{ needs.prepare.outputs.target_repo }}
permissions:
contents: read
- packages: write # For package cache
+ packages: write # For package cache
+ actions: write # For cleaning up cache
secrets:
GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 02:23:58 +0000