Files
orca/config/scripts/cloud-integration/premerge-check.sh
T
Neil 8b7b51394e test(cloud): base-list skip is an exact whole-line filter with a unit test; off-list tests stay selected
filter-base-list-tests.sh is the one place premerge drops base-list tests (logged to stderr). The test covers:
a base-list test is dropped and logged while an off-list test is still selected; shared prefix/suffix/folder
never skips; entries are literal (no regex) and comments are ignored; a missing list keeps everything.
2026-11-11 07:17:49 -08:00

78 lines
4.5 KiB
Bash
Executable File

#!/usr/bin/env bash
# Gate for merging into cloud/integration (no CI on nwparker/orca-private). Run from your branch, before merging:
# config/scripts/cloud-integration/premerge-check.sh
# Merges the current private/cloud/integration into a throwaway worktree with your branch, then requires
# pnpm typecheck, the full pnpm lint suite (pre-commit hooks only lint staged files), and vitest for the tests your
# branch touched: changed *.test.ts(x), every test in the folder of each changed source, every test that imports a
# changed module, and each touched cloud/apps/* package's own suite. PREMERGE_FULL=1 runs the whole vitest suite.
# The merged copy of this script is what runs, so the gate is always integration's current one.
# Prints "premerge OK" only when everything passes. Nothing here reads /tmp state. On macOS (no flock) wrap heavy runs
# as /tmp/vdrv/heavy.sh 'config/scripts/cloud-integration/premerge-check.sh'.
set -euo pipefail
base=private/cloud/integration
if [[ -z "${PREMERGE_IN_WORKTREE:-}" ]]; then
branch=$(git rev-parse --abbrev-ref HEAD)
git fetch -q private +cloud/integration:refs/remotes/private/cloud/integration
dir=$(mktemp -d "${TMPDIR:-/tmp}/cloud-premerge-XXXX")
git worktree add -q --detach "$dir" HEAD
if ! (cd "$dir" && git merge -q --no-edit "$base"); then
git worktree remove --force "$dir" >/dev/null 2>&1 || true
exit 1
fi
# Re-run the MERGED copy of this script, so a branch cut before a gate change still gets the current gate.
exec env PREMERGE_IN_WORKTREE="$dir" PREMERGE_BRANCH="$branch" bash "$dir/config/scripts/cloud-integration/premerge-check.sh"
fi
dir=$PREMERGE_IN_WORKTREE
branch=${PREMERGE_BRANCH:-unknown}
trap 'git -C "$dir" worktree remove --force "$dir" >/dev/null 2>&1 || true' EXIT
cd "$dir"
pnpm install --frozen-lockfile >/dev/null
pnpm typecheck
pnpm lint
tests=()
if [[ "${PREMERGE_FULL:-}" == 1 ]]; then
# Full suite via the repo's own runner (what every build cut runs before its smoke). Slow; use for wide changes.
pnpm test
else
# Targeted tests. Sibling filenames alone missed real regressions (#347 broke a *-race.test.ts in the same folder),
# so for each changed source this also runs (a) every test in its folder and (b) every test under src/ that
# imports it by module name (relative path, '@/' alias, vi.mock or dynamic import). Over-selection is fine.
all_tests=$(git ls-files 'src/*.test.ts' 'src/*.test.tsx')
while IFS= read -r file; do
case "$file" in
*.test.ts | *.test.tsx) if [[ -f "$file" ]]; then tests+=("$file"); fi ;;
*.ts | *.tsx)
folder=$(dirname "$file")
while IFS= read -r t; do
if [[ -n "$t" && "$(dirname "$t")" == "$folder" ]]; then tests+=("$t"); fi
done <<<"$all_tests"
module=$(basename "${file%.*}")
if [[ "$module" == index ]]; then module=$(basename "$folder"); fi
while IFS= read -r t; do
if [[ -n "$t" ]]; then tests+=("$t"); fi
done < <(printf "%s\n" "$all_tests" | xargs grep -lE "['\"][^'\"]*/${module}(\\.tsx?)?['\"]" 2>/dev/null || true)
;;
esac
done < <(git diff --name-only --diff-filter=AMR "$base"...HEAD -- 'src/*')
if ((${#tests[@]} > 0)); then
# Skip files on the full-suite base list: they fail on upstream too (this Mac's environment), so they would only
# block. Exact whole-line matches only (filter-base-list-tests.sh, unit-tested); repo paths have no spaces.
tests=($(printf "%s\n" "${tests[@]}" | sort -u |
bash config/scripts/cloud-integration/filter-base-list-tests.sh config/scripts/cloud-integration/full-suite-base-list.txt))
echo "premerge: ${#tests[@]} targeted test file(s):"
fi
if ((${#tests[@]} > 0)); then
printf " %s\n" "${tests[@]}"
node config/scripts/workspace-package-build/build-workspace-packages.mjs >/dev/null
node config/scripts/native-build/node-addons/ensure-native-runtime.mjs --runtime=node >/dev/null
# run-vitest.mjs applies the repo's test env policy (e.g. ORCA_BACKGROUND_LAUNCH=1); bare vitest gives false failures.
node config/scripts/test-runtime/execution-policy/run-vitest.mjs run --config config/vitest.config.ts "${tests[@]}"
fi
fi
for app in $(git diff --name-only "$base"...HEAD -- cloud/apps | cut -d/ -f1-3 | sort -u); do
if [[ -d "$app" ]]; then (cd "$app" && npx vitest run); fi
done
if [[ "${PREMERGE_FULL:-}" == 1 ]]; then scope="the full vitest suite"; else scope="${#tests[@]} targeted test file(s)"; fi
echo "premerge OK: $branch merges cleanly into cloud/integration with typecheck, lint and $scope green."