Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 0 additions & 7 deletions .github/scripts/assert_ffmpeg_not_installed.sh

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/build_ffmpeg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
export FFMPEG_VERSION="${{ matrix.ffmpeg-version }}"
export FFMPEG_ROOT="${PWD}/ffmpeg"

.github/scripts/build_ffmpeg.sh
packaging/build_ffmpeg.sh

tar -czf ffmpeg.tar.gz ffmpeg/include ffmpeg/lib

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/wheel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ jobs:
# but we need to checkout the repo to access this file, and we don't
# want to checkout the repo before installing the wheel to avoid any
# side-effect. It's OK.
.github/scripts/assert_ffmpeg_not_installed.sh
source packaging/helpers.sh
assert_ffmpeg_not_installed

conda install "ffmpeg=${{ matrix.ffmpeg-version-for-tests }}" -c conda-forge
ffmpeg -version
Expand Down
File renamed without changes.
File renamed without changes.
8 changes: 8 additions & 0 deletions .github/scripts/helpers.sh → packaging/helpers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,11 @@ assert_in_wheel() {
exit 1
fi
}

assert_ffmpeg_not_installed() {
if command -v "ffmpeg" &> /dev/null
then
echo "ffmpeg is installed, but it shouldn't! Exiting!!"
exit 1
fi
}
4 changes: 2 additions & 2 deletions packaging/post_build_script.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

source .github/scripts/helpers.sh
source packaging/helpers.sh

wheel_path=$(pwd)/$(find dist -type f -name "*.whl")
echo "Wheel content:"
Expand All @@ -24,7 +24,7 @@ assert_not_in_wheel $wheel_path "^packaging"
extracted_wheel_dir=$(mktemp -d)
unzip -q $wheel_path -d $extracted_wheel_dir
symbols_matches=$(find $extracted_wheel_dir | grep ".so$" | xargs objdump --syms | grep GLIBCXX_3.4.)
python .github/scripts/check_glibcxx.py "$symbols_matches"
python packaging/check_glibcxx.py "$symbols_matches"

echo "ls dist"
ls dist
Expand Down