ai/at
1
0
This commit is contained in:
2026-01-08 13:19:29 +09:00
parent d03d0f0755
commit 48e3cb81b1

View File

@@ -276,6 +276,10 @@ function at-repos-patch-apply-all() {
repo="atproto" repo="atproto"
elif [[ $filename == *"feed"* ]]; then elif [[ $filename == *"feed"* ]]; then
repo="feed-generator" repo="feed-generator"
# feed-generatorパッチ適用前に既存のDockerfileを削除upstreamと競合回避
if [[ $filename == "200-feed-generator-custom.patch" ]]; then
rm -f "$d/repos/feed-generator/Dockerfile"
fi
fi fi
patch-apply "$title" "$repo" "$filename" patch-apply "$title" "$repo" "$filename"