Skip to content

Commit 4d853fa

Browse files
committed
ci: pin ffmpeg build 7.1.1
1 parent 53209e2 commit 4d853fa

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@ name: ci
22

33
on:
44
push:
5-
branches: [ main ]
5+
branches: [main]
66
pull_request:
7-
branches: [ main ]
7+
branches: [main]
88

99
env:
1010
CARGO_TERM_COLOR: always
1111

1212
jobs:
13-
1413
build-linux:
1514
name: build / linux / ffmpeg ${{ matrix.ffmpeg_version }}
1615
runs-on: ubuntu-latest
@@ -32,7 +31,7 @@ jobs:
3231
3332
- name: Setup Rust
3433
uses: dtolnay/rust-toolchain@stable
35-
34+
3635
- name: Build
3736
run: cargo build
3837

@@ -50,7 +49,7 @@ jobs:
5049
5150
- name: Setup Rust
5251
uses: dtolnay/rust-toolchain@stable
53-
52+
5453
- name: Build
5554
run: cargo build
5655

@@ -59,7 +58,7 @@ jobs:
5958
runs-on: windows-latest
6059

6160
env:
62-
FFMPEG_DOWNLOAD_URL: https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-full-shared.7z
61+
FFMPEG_DOWNLOAD_URL: https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-7.1.1-full_build-shared.7z
6362

6463
steps:
6564
- name: Checkout
@@ -69,16 +68,16 @@ jobs:
6968
run: |
7069
$VCINSTALLDIR = $(& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath)
7170
Add-Content $env:GITHUB_ENV "LIBCLANG_PATH=${VCINSTALLDIR}\VC\Tools\LLVM\x64\bin`n"
72-
Invoke-WebRequest "${env:FFMPEG_DOWNLOAD_URL}" -OutFile ffmpeg-release-full-shared.7z
73-
7z x ffmpeg-release-full-shared.7z
71+
Invoke-WebRequest "${env:FFMPEG_DOWNLOAD_URL}" -OutFile ffmpeg-7.1.1-full_build-shared.7z
72+
7z x ffmpeg-7.1.1-full_build-shared.7z
7473
mkdir ffmpeg
7574
mv ffmpeg-*/* ffmpeg/
7675
Add-Content $env:GITHUB_ENV "FFMPEG_DIR=${pwd}\ffmpeg`n"
7776
Add-Content $env:GITHUB_PATH "${pwd}\ffmpeg\bin`n"
7877
7978
- name: Setup Rust
8079
uses: dtolnay/rust-toolchain@stable
81-
80+
8281
- name: Build
8382
run: cargo build
8483

@@ -95,17 +94,17 @@ jobs:
9594
DEBIAN_FRONTEND=noninteractive apt-get update
9695
DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential ca-certificates clang curl pkg-config
9796
98-
# - name: Setup Rust
99-
# uses: dtolnay/rust-toolchain@stable
100-
97+
# - name: Setup Rust
98+
# uses: dtolnay/rust-toolchain@stable
99+
101100
# TODO: Temporarily use nightly version of Rust for tests. Stable
102101
# currently has a bug that causes linking to fail. The fix is in
103102
# https://github.com/rust-lang/rust/commit/9ed0d11efbec18a1fa4155576a3bcb685676d23c
104103
# and will hit stable at some point.
105104

106105
- name: Setup Rust
107106
uses: dtolnay/rust-toolchain@nightly
108-
107+
109108
- name: Test
110109
run: cargo +nightly test --all-features # TODO: Temporarily use nightly for tests.
111110

@@ -126,7 +125,7 @@ jobs:
126125
uses: dtolnay/rust-toolchain@stable
127126
with:
128127
components: rustfmt, clippy
129-
128+
130129
- name: Rustfmt
131130
run: cargo fmt --all -- --check
132131

0 commit comments

Comments
 (0)