Skip to content

Commit cdf07ad

Browse files
committed
1 parent 58b68c2 commit cdf07ad

File tree

3 files changed

+35
-31
lines changed

3 files changed

+35
-31
lines changed

.ci/build-wheels.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ make install;
5757
make distclean;
5858

5959
cd ~/ffmpeg_sources;
60-
curl -kLO "https://cfhcable.dl.sourceforge.net/project/lame/lame/$LAME_VERSION/lame-$LAME_VERSION.tar.gz"
60+
curl -kLO "https://downloads.sourceforge.net/project/lame/lame/$LAME_VERSION/lame-$LAME_VERSION.tar.gz"
6161
tar xzf "lame-$LAME_VERSION.tar.gz"
6262
cd "lame-$LAME_VERSION"
6363
./configure --prefix="$BUILD_DIR" --enable-nasm --enable-shared;

.ci/build_wheels_osx.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ if [ "$ARCH" = "x86_64" ]; then
127127
arg=("--enable-nasm")
128128
fi
129129
cd "$SRC_PATH";
130-
curl -kLO "https://cfhcable.dl.sourceforge.net/project/lame/lame/$LAME_VERSION/lame-$LAME_VERSION.tar.gz"
130+
curl -kLO "https://downloads.sourceforge.net/project/lame/lame/$LAME_VERSION/lame-$LAME_VERSION.tar.gz"
131131
tar xzf "lame-$LAME_VERSION.tar.gz"
132132
cd "lame-$LAME_VERSION"
133133
git apply "$base_dir/.ci/libmp3lame-symbols.patch"

.github/workflows/pythonapp.yml

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@ jobs:
1919
FFMPEG_ROOT: ~/ff_deps/ffmpeg
2020
strategy:
2121
matrix:
22-
python: [ '3.9', '3.10', '3.11', '3.12', '3.13']
22+
# TODO: Add free-threaded 3.14t
23+
python: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
2324
steps:
24-
- uses: actions/checkout@v4.2.2
25+
- uses: actions/checkout@v5.0.0
2526
- name: Set up Python ${{ matrix.python }}
26-
uses: actions/setup-python@v5.4.0
27+
uses: actions/setup-python@v6.0.0
2728
with:
2829
python-version: ${{ matrix.python }}
2930
- name: Get dependencies
@@ -71,12 +72,12 @@ jobs:
7172
$env:FFMPEG_ROOT=(get-item $env:FFMPEG_ROOT).FullName
7273
python setup.py bdist_wheel
7374
- name: Upload wheel
74-
uses: actions/upload-artifact@v4.6.2
75+
uses: actions/upload-artifact@v5.0.0
7576
with:
7677
name: py_wheel-win-${{ matrix.python }}
7778
path: dist
7879
- name: Upload to GitHub Release
79-
uses: softprops/action-gh-release@v2.2.1
80+
uses: softprops/action-gh-release@v2.4.1
8081
if: startsWith(github.ref, 'refs/tags/')
8182
env:
8283
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -129,12 +130,12 @@ jobs:
129130
runs-on: ${{ matrix.os }}
130131
needs: windows_wheels_tests
131132
steps:
132-
- uses: actions/checkout@v4.2.2
133+
- uses: actions/checkout@v5.0.0
133134
- name: Set up Python 3.x
134-
uses: actions/setup-python@v5.4.0
135+
uses: actions/setup-python@v6.0.0
135136
with:
136137
python-version: 3.x
137-
- uses: actions/download-artifact@v4.2.1
138+
- uses: actions/download-artifact@v6.0.0
138139
with:
139140
pattern: py_wheel-*
140141
merge-multiple: true
@@ -169,12 +170,12 @@ jobs:
169170
runs-on: ${{ matrix.os }}
170171
needs: linux_wheels
171172
steps:
172-
- uses: actions/checkout@v4.2.2
173-
- name: Set up Python 3.x
174-
uses: actions/setup-python@v5.4.0
173+
- uses: actions/checkout@v5.0.0
174+
- name: Set up Python 3.13
175+
uses: actions/setup-python@v6.0.0
175176
with:
176-
python-version: 3.x
177-
- uses: actions/download-artifact@v4.2.1
177+
python-version: 3.13 # 3.14 fails!
178+
- uses: actions/download-artifact@v6.0.0
178179
with:
179180
pattern: py_wheel-*
180181
merge-multiple: true
@@ -215,12 +216,12 @@ jobs:
215216
cibw_archs: 'aarch64'
216217
cibw_build: 'cp39-manylinux_aarch64 cp310-manylinux_aarch64 cp311-manylinux_aarch64 cp312-manylinux_aarch64 cp313-manylinux_aarch64'
217218
steps:
218-
- uses: actions/checkout@v4.2.2
219+
- uses: actions/checkout@v5.0.0
219220
- name: Set up Python 3.x
220-
uses: actions/setup-python@v5.4.0
221+
uses: actions/setup-python@v6.0.0
221222
with:
222223
python-version: 3.x
223-
- uses: actions/cache@v4.2.3
224+
- uses: actions/cache@v4.3.0
224225
id: deps-cache
225226
with:
226227
path: ffmpeg_build
@@ -231,18 +232,20 @@ jobs:
231232
mkdir dist
232233
docker run --rm -v `pwd`:/io:rw quay.io/pypa/manylinux2014_${{ matrix.cibw_archs }} /io/.ci/build-wheels.sh
233234
- name: Install cibuildwheel
235+
# TODO: Upgrade to cibuildwheel~=3.2.1
234236
run: |
235237
python -m pip install cibuildwheel~=2.23.3
238+
236239
- name: Make wheels
237240
run: |
238241
python -m cibuildwheel --output-dir dist
239242
- name: Upload wheel
240-
uses: actions/upload-artifact@v4.6.2
243+
uses: actions/upload-artifact@v5.0.0
241244
with:
242245
name: py_wheel-linux-${{ matrix.os }}-${{ matrix.cibw_archs }}
243246
path: dist
244247
- name: Upload to GitHub Release
245-
uses: softprops/action-gh-release@v2.2.1
248+
uses: softprops/action-gh-release@v2.4.1
246249
if: startsWith(github.ref, 'refs/tags/')
247250
env:
248251
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -272,15 +275,15 @@ jobs:
272275
matrix:
273276
arch: [ "x86_64", "arm64" ]
274277
steps:
275-
- uses: actions/checkout@v4.2.2
278+
- uses: actions/checkout@v5.0.0
276279
- name: Set up Python
277-
uses: actions/setup-python@v5.4.0
280+
uses: actions/setup-python@v6.0.0
278281
with:
279282
python-version: 3.x
280283

281284
- name: Cache ffmpeg
282285
id: cache-ffmpeg
283-
uses: actions/cache@v4.2.3
286+
uses: actions/cache@v4.3.0
284287
with:
285288
path: ~/${{ env.FFMPEG_BUILD_PATH }}_${{ matrix.arch }}
286289
key: ${{ runner.os }}-ffmpeg-${{ matrix.arch }}-${{ env.MACOSX_DEPLOYMENT_TARGET }}-${{ env.MACOSX_DEPLOYMENT_TARGET_ARM }}-${{ hashFiles('.ci/build_wheels_osx.sh') }}
@@ -289,6 +292,7 @@ jobs:
289292
run: bash .ci/build_wheels_osx.sh "${{ matrix.arch }}"
290293

291294
- name: Install cibuildwheel
295+
# TODO: Upgrade to cibuildwheel~=3.2.1
292296
run: |
293297
python -m pip install cibuildwheel~=2.23.3
294298
- name: Build wheels
@@ -298,7 +302,7 @@ jobs:
298302
python -m cibuildwheel --output-dir dist
299303
300304
- name: Upload wheel
301-
uses: actions/upload-artifact@v4.6.2
305+
uses: actions/upload-artifact@v5.0.0
302306
with:
303307
name: py_wheel-osx-${{ matrix.arch }}
304308
path: dist
@@ -307,13 +311,13 @@ jobs:
307311
runs-on: macos-13
308312
needs: osx_wheels_create
309313
steps:
310-
- uses: actions/checkout@v4.2.2
314+
- uses: actions/checkout@v5.0.0
311315
- name: Set up Python
312-
uses: actions/setup-python@v5.4.0
316+
uses: actions/setup-python@v6.0.0
313317
with:
314318
python-version: 3.x
315319

316-
- uses: actions/download-artifact@v4.2.1
320+
- uses: actions/download-artifact@v6.0.0
317321
with:
318322
pattern: py_wheel-*
319323
merge-multiple: true
@@ -326,13 +330,13 @@ jobs:
326330
bash ../.ci/merge_osx_deps.sh
327331
328332
- name: Upload wheel
329-
uses: actions/upload-artifact@v4.6.2
333+
uses: actions/upload-artifact@v5.0.0
330334
with:
331335
name: py_wheel-osx-fused
332336
path: dist
333337

334338
- name: Upload to GitHub Release
335-
uses: softprops/action-gh-release@v2.2.1
339+
uses: softprops/action-gh-release@v2.4.1
336340
if: startsWith(github.ref, 'refs/tags/')
337341
env:
338342
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -361,9 +365,9 @@ jobs:
361365
docs:
362366
runs-on: ubuntu-latest
363367
steps:
364-
- uses: actions/checkout@v4.2.2
368+
- uses: actions/checkout@v5.0.0
365369
- name: Set up Python 3.x
366-
uses: actions/setup-python@v5.4.0
370+
uses: actions/setup-python@v6.0.0
367371
with:
368372
python-version: 3.x
369373
- name: Install

0 commit comments

Comments
 (0)