Skip to content

Commit 8afea8d

Browse files
Fix apply-patches.sh for CI: configure git identity
git am requires committer identity. CI runners don't have one configured. Set a default if missing before applying patches.
1 parent 8d76f4e commit 8afea8d

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

scripts/apply-patches.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ cd "$BUILD_DIR"
5252
PATCH_FILES=("$PATCHES_DIR"/*.patch)
5353
if [ -e "${PATCH_FILES[0]}" ]; then
5454
echo "==> Applying patches..."
55+
# Ensure git identity exists for git am (CI runners may not have one)
56+
git config user.name >/dev/null 2>&1 || git config user.name "temporal-sdk-pkware"
57+
git config user.email >/dev/null 2>&1 || git config user.email "temporal-sdk-pkware@pkware.com"
58+
5559
if ! git am "${PATCH_FILES[@]}"; then
5660
echo ""
5761
echo "Error: Patch apply failed. Resolve conflicts in build/, then:"

0 commit comments

Comments
 (0)