Skip to content

Commit aa2a1d4

Browse files
committed
fix(ci): avoid commit identity for unstable builds
1 parent 1791670 commit aa2a1d4

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

unstable-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ trap cleanup EXIT
7474

7575
echo "==> Building from upstream ${UNSTABLE_NAME} with Zaparoo ${FORK_SHORT_SHA}"
7676
git worktree add --detach "${TMP_WORKTREE}" "${UNSTABLE_COMMIT}" >/dev/null
77-
git -C "${TMP_WORKTREE}" merge --no-edit -Xignore-all-space "${FORK_HEAD}"
77+
git -C "${TMP_WORKTREE}" merge --no-commit --no-ff -Xignore-all-space "${FORK_HEAD}"
7878

7979
"${TMP_WORKTREE}/docker-build.sh" "$@"
8080

0 commit comments

Comments
 (0)