Skip to content

Commit 9b93b3a

Browse files
nihil-admirarigithub-actions[bot]
authored andcommitted
Make patches available within Docker container (fixes #54)
1 parent a618417 commit 9b93b3a

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

build.sh

+7-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,12 @@ cat <<EOF >"$BUILD_SCRIPT"
7171
git config user.email "builder@localhost"
7272
git config user.name "Builder"
7373
74-
for patch in '/patches/$GIT_BRANCH'/*.patch; do
74+
PATCHES=('/patches/$GIT_BRANCH'/*.patch)
75+
if [[ "\${#PATCHES[@]}" = 0 ]]; then
76+
echo 'No patches found for $GIT_BRANCH'
77+
exit 1
78+
fi
79+
for patch in "\${PATCHES[@]}"; do
7580
echo "Applying \$patch"
7681
git apply "\$patch"
7782
done
@@ -86,7 +91,7 @@ EOF
8691

8792
[[ -t 1 ]] && TTY_ARG="-t" || TTY_ARG=""
8893

89-
docker run --rm -i $TTY_ARG "${UIDARGS[@]}" -v "$PWD/ffbuild":/ffbuild -v "$BUILD_SCRIPT":/build.sh "$IMAGE" bash /build.sh
94+
docker run --rm -i $TTY_ARG "${UIDARGS[@]}" -v "$PWD/ffbuild":/ffbuild -v "$PWD/patches/ffmpeg/":/patches -v "$BUILD_SCRIPT":/build.sh "$IMAGE" bash /build.sh
9095

9196
mkdir -p artifacts
9297
ARTIFACTS_PATH="$PWD/artifacts"

0 commit comments

Comments
 (0)