Skip to content

Fix non-default feature build: Feature gate unpack_ffmpeg with download_ffmpeg #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 4, 2024
Merged

Fix non-default feature build: Feature gate unpack_ffmpeg with download_ffmpeg #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89091ca
Feature gate `unpack_ffmpeg` with `download_ffmpeg`
Wumpf Nov 4, 2024
df74bb9
add cargo check without default features to ci
Wumpf Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:
- uses: FedericoCarboni/setup-ffmpeg@v3
- name: Build
run: cargo build --verbose
- name: Check without default features
run: cargo check --no-default-features
- name: Run tests
run: cargo test --all-targets --all-features --verbose
- name: Try auto-download
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:
- uses: FedericoCarboni/setup-ffmpeg@v3
- name: Build
run: cargo build --verbose
- name: Check without default features
run: cargo check --no-default-features
- name: Run tests
run: cargo test --all-targets --all-features --verbose
- name: Try auto-download
Expand Down
1 change: 1 addition & 0 deletions src/download.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ pub fn download_ffmpeg_package(url: &str, download_dir: &Path) -> anyhow::Result

/// After downloading, unpacks the archive to a folder, moves the binaries to
/// their final location, and deletes the archive and temporary folder.
#[cfg(feature = "download_ffmpeg")]
pub fn unpack_ffmpeg(from_archive: &PathBuf, binary_folder: &Path) -> anyhow::Result<()> {
let temp_dirname = UNPACK_DIRNAME;
let temp_folder = binary_folder.join(temp_dirname);
Expand Down
Loading