From 070406f2ff1e2c7d4ba6650ca822461eba9de849 Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Thu, 23 Apr 2026 00:53:29 +0000 Subject: [PATCH] COMP: Use ITK default branch origin/main in ASV config and docs ITK's default branch has been `main` for some time; the ASV harness still referenced `origin/master`, causing `asv run` to abort with "Unknown branch origin/master in configuration" whenever the caller's itk-repo symlink pointed at a modern ITK checkout. - asv.conf.json: `branches` now lists `origin/main`. - README-asv.md: PR-comparison example uses `git merge-base origin/main HEAD`. No functional change for the benchmark code itself; the fix is purely to the branch identifier ASV uses to label the time series. --- README-asv.md | 2 +- asv.conf.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README-asv.md b/README-asv.md index f86225d..e246cf4 100644 --- a/README-asv.md +++ b/README-asv.md @@ -69,7 +69,7 @@ asv run --machine $(hostname -s) --set-commit-hash "$ITK_SHA" --python=same ```sh # Assumes ITK-base-build and ITK-head-build already exist, and the # itk-repo symlink points at the ITK clone. -BASE_SHA=$(cd itk-repo && git merge-base origin/master HEAD) +BASE_SHA=$(cd itk-repo && git merge-base origin/main HEAD) HEAD_SHA=$(cd itk-repo && git rev-parse HEAD) ITK_BENCHMARK_BIN=/path/to/ITK-base-build/bin \ diff --git a/asv.conf.json b/asv.conf.json index 3049c82..5e0c01d 100644 --- a/asv.conf.json +++ b/asv.conf.json @@ -4,7 +4,7 @@ "project_url": "https://itk.org/", "_comment_repo": "'repo' points at the ITK source tree whose commits label the time series. The caller (CI workflow or local smoke test) must create a symlink named 'itk-repo' at the root of this harness pointing to the ITK clone before invoking asv.", "repo": "itk-repo", - "branches": ["origin/master"], + "branches": ["origin/main"], "environment_type": "existing", "show_commit_url": "https://github.com/InsightSoftwareConsortium/ITK/commit/", "benchmark_dir": "benchmarks",