From e878dbd472e416ecd7d35da0a8e90738fc9413e3 Mon Sep 17 00:00:00 2001 From: Jason Woltje Date: Mon, 10 Aug 2026 15:22:25 -0500 Subject: [PATCH] test(ci): cover next-lane PR merges --- .../mosaic/framework/tools/git/test-pr-merge-head-pin.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/mosaic/framework/tools/git/test-pr-merge-head-pin.sh b/packages/mosaic/framework/tools/git/test-pr-merge-head-pin.sh index 0eec10f0..3d023619 100644 --- a/packages/mosaic/framework/tools/git/test-pr-merge-head-pin.sh +++ b/packages/mosaic/framework/tools/git/test-pr-merge-head-pin.sh @@ -17,9 +17,10 @@ make_fixture() { cp "$SCRIPT_DIR/detect-platform.sh" "$tools/detect-platform.sh" git -C "$root/repo" init -q git -C "$root/repo" remote add origin "$remote" + local base_branch="${3:-main}" cat > "$tools/pr-metadata.sh" < "$tools/ci-queue-wait.sh" <<'SH' #!/usr/bin/env bash @@ -29,8 +30,8 @@ SH } rm -rf "$WORK_DIR" -make_fixture gitea https://git.example.test/acme/widgets.git -make_fixture github https://github.com/acme/widgets.git +make_fixture gitea https://git.example.test/acme/widgets.git next +make_fixture github https://github.com/acme/widgets.git main cat > "$WORK_DIR/gitea/curl" <<'SH' #!/usr/bin/env bash