Skip to content

Commit 598851b

Browse files
committed
ci: Tweak patch call
1 parent 61e82df commit 598851b

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

vendor-one.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,12 @@ for commit in $(git -C "$upstream_dir" log --first-parent --reverse --format="%H
4747
DUCKDB_PATH="$upstream_dir" python3 rconfigure.py
4848

4949
for f in patch/*.patch; do
50-
# cat $f | patch -p1 --dry-run
51-
cat $f | patch -p1
50+
if patch -i $f -p1 --forward --dry-run; then
51+
patch -i $f -p1 --forward
52+
else
53+
echo "Removing patch $f"
54+
rm $f
55+
fi
5256
done
5357

5458
# Always vendor tags

0 commit comments

Comments
 (0)