Skip to content

PR: Build FFmpeg 4.2 #524

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.

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 12 commits into from
Sep 21, 2020
Merged

PR: Build FFmpeg 4.2 #524

merged 12 commits into from
Sep 21, 2020

Conversation

andfoy
Copy link
Contributor

@andfoy andfoy commented Sep 18, 2020

This PR adds FFmpeg 4.2 builds to the PyTorch channel, it also disables packages for Windows temporarily.
See pytorch/vision#2650 and pytorch/vision#2596 (comment)

cc @seemethere @fmassa

set -exou pipefail

mkdir -p "${DIR}/output/"
# This is so that circle's persist_to_workspace doesn't fail when builds don't run
touch "${DIR}/output/hello"

if git merge-base --is-ancestor "${FOLDER_COMMIT}" "${BASE_COMMIT}"; then
if [ $COMMIT_SAME -eq 1 ]; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The previous command should just work, I don't think this change is actually necessary

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to run it both locally and on the CI on the previous version, and it didn't work at all, I think it is related to the set -exou that comes after assigning the variable

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I definitely thought conditionals were exempt from the set -e erroring out, but I'm willing to just push this through since it's relatively small.

@@ -148,17 +142,11 @@ workflows:
is-python3: true
name: ffmpeg_mac
python_version: '3.7'
- ffmpeg_win:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we be removing windows here?

@seemethere seemethere merged commit 589a615 into pytorch:master Sep 21, 2020
@andfoy andfoy deleted the build_ffmpeg_4.2 branch September 21, 2020 22:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants